diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8411d31..d52b0ce 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3181,7 +3181,7 @@
 
         <!-- Quick Settings tiles for Developer Options -->
         <service
-            android:name=".qstile.DevelopmentTiles$ShowLayout"
+            android:name=".development.qstile.DevelopmentTiles$ShowLayout"
             android:label="@string/debug_layout"
             android:icon="@drawable/tile_icon_show_layout"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
@@ -3191,7 +3191,7 @@
             </intent-filter>
         </service>
         <service
-            android:name=".qstile.DevelopmentTiles$GPUProfiling"
+            android:name=".development.qstile.DevelopmentTiles$GPUProfiling"
             android:label="@string/track_frame_time"
             android:icon="@drawable/tile_icon_graphics"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
@@ -3201,7 +3201,7 @@
             </intent-filter>
         </service>
         <service
-            android:name=".qstile.DevelopmentTiles$ForceRTL"
+            android:name=".development.qstile.DevelopmentTiles$ForceRTL"
             android:label="@string/force_rtl_layout_all_locales"
             android:icon="@drawable/tile_icon_force_rtl"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
@@ -3211,7 +3211,7 @@
             </intent-filter>
         </service>
         <service
-            android:name=".qstile.DevelopmentTiles$AnimationSpeed"
+            android:name=".development.qstile.DevelopmentTiles$AnimationSpeed"
             android:label="@string/window_animation_scale_title"
             android:icon="@drawable/tile_icon_animation_speed"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
@@ -3220,11 +3220,6 @@
                 <action android:name="android.service.quicksettings.action.QS_TILE" />
             </intent-filter>
         </service>
-        <activity
-            android:name=".qstile.DevelopmentTileConfigActivity"
-            android:excludeFromRecents="true"
-            android:launchMode="singleInstance"
-            android:label="@string/quick_settings_developer_tiles" />
 
         <activity android:name=".HelpTrampoline"
             android:exported="true"
diff --git a/res/layout/suggestion_condition_footer.xml b/res/layout/suggestion_condition_footer.xml
index 3eea6a5..5de9d55 100644
--- a/res/layout/suggestion_condition_footer.xml
+++ b/res/layout/suggestion_condition_footer.xml
@@ -20,15 +20,16 @@
     style="@style/SuggestionConditionStyle"
     android:layout_width="match_parent"
     android:layout_height="44dp"
-    android:paddingTop="10dp"
-    android:paddingEnd="10dp"
+    android:contentDescription="@string/dashboard_suggestion_condition_footer_content_description"
+    android:gravity="end"
     android:orientation="horizontal"
-    android:gravity="end">
+    android:paddingTop="10dp"
+    android:paddingEnd="10dp">
 
     <ImageView
         android:id="@+id/collapse_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@drawable/ic_expand_less"/>
+        android:src="@drawable/ic_expand_less" />
 
 </LinearLayout>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 17b23fb..3d760d2 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi-Fi-MAC-adres"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth-adres"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Reeksnommer"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Onbeskikbaar"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Tyd aanlyn"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Wakkertyd"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Interne berging"</string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Kan nie handmatig sinkroniseer nie"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Sinkronisering vir hierdie item is tans gedeaktiveer. Om hierdie instelling te verander, skakel agtergronddata en outomatiese sinkronisering tydelik aan."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G-Mac-adres"</string>
     <string name="enter_password" msgid="8035706727471334122">"Voer jou wagwoord in om Android te begin"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Voer jou PIN in om Android te begin"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Teken jou patroon om Android te begin"</string>
@@ -3055,8 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Wanneer skerm af is"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Wanneer skerm aan of af is"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Kennisgewingsinstellings"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"OK"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Stuur terugvoer oor hierdie toestel"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Voer admin-PIN in"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Aan"</string>
@@ -3730,7 +3726,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Kry \'n kykie van jou nuwe tablet"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Kry \'n kykie van jou nuwe toestel"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Hierdie kenmerk is nie op hierdie toestel beskikbaar nie"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"IMS-registrasiestaat"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"Geregistreer"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Nie geregistreer nie"</string>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 0464d72..4743a53 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"የWi-Fi ማክ አድራሻ"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"የብሉቱዝ አድራሻ"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"መለያ ቁጥር"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"አይገኝም"</string>
     <string name="status_up_time" msgid="7294859476816760399">"የቆየበት ሰዓት"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"ነቅቶ የቆየበት ሰዓት"</string>
     <string name="internal_memory" msgid="9129595691484260784">"የውስጥ ማከማቻ"</string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"በእጅ ማመሳሰል አልተቻለም"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"አመሳስል ለእዚህ ንጥል በአሁን ጊዜ ቦዝኗል።ምርጫህን ለመለወጥ፣ ለጊዜው የዳራ ውሂብ እና ራስ ሰር ማመሳሰያ አብራ።"</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"የ4G MAC አድራሻ"</string>
     <string name="enter_password" msgid="8035706727471334122">"Androidን ለመጀመር የይለፍ ቃልዎን ያስገቡ"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Androidን ለመጀመር ፒንዎን ያስገቡ"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Androidን ለመጀመር ስርዓተ-ጥለትዎን ይሳሉ"</string>
@@ -3055,8 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"ማያ ገጹ ሲጠፋ"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"ማያ ገጹ ሲበራ ወይም ሲጠፋ"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"የማሳወቂያ ቅንብሮች"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"እሺ"</string>
     <string name="device_feedback" msgid="3238056036766293294">"ስለዚህ መሣሪያ ግብረመልስ ላክ"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"የአስተዳዳሪ ፒን ያስገቡ"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"በርቷል"</string>
@@ -3730,7 +3726,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"በአዲሱ ጡባዊዎ ላይ ጉብኝት ያድርጉ"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"በአዲሱ መሣሪያዎ ላይ ጉብኝት ያድርጉ"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"ይህ ባህሪ በዚህ መሣሪያ ላይ አይገኝም"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"የIMS ምዝገባ ቀን"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"የተመዘገበ"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"አልተመዘገበም"</string>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index b434cba..ac54406 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -1211,7 +1211,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"‏عنوان Mac لشبكة Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"عنوان البلوتوث"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"الرقم المسلسل"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"غير متاح"</string>
     <string name="status_up_time" msgid="7294859476816760399">"وقت التشغيل"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"وقت الوضع النشط"</string>
     <string name="internal_memory" msgid="9129595691484260784">"وحدة التخزين الداخلية"</string>
@@ -2433,8 +2432,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"لا يمكن المزامنة يدويًا"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"مزامنة هذا العنصر معطّلة في الوقت الحالي. لتغيير هذا الإعداد، شغّل بشكل مؤقت بيانات الخلفية والمزامنة التلقائية."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"الجيل الرابع"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"‏عنوان 4G MAC"</string>
     <string name="enter_password" msgid="8035706727471334122">"‏لبدء تشغيل Android، أدخل كلمة المرور"</string>
     <string name="enter_pin" msgid="5305333588093263790">"‏لبدء تشغيل Android، أدخل رقم التعريف الشخصي"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"‏لبدء تشغيل Android، ارسم النقش"</string>
@@ -3187,8 +3184,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"عندما تكون الشاشة في وضع الإيقاف"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"عندما تكون الشاشة في وضع التشغيل أو الإيقاف"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"إعدادات الإشعارات"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"موافق"</string>
     <string name="device_feedback" msgid="3238056036766293294">"إرسال تعليقات حول هذا الجهاز"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"إدخال رقم التعريف الشخصي للمشرف"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"تشغيل"</string>
@@ -3954,7 +3950,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"الحصول على جولة في جهازك اللوحي الجديد"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"الحصول على جولة في جهازك الجديد"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"لا تتوفر هذه الميزة على هذا الجهاز"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"‏حالة تسجيل IMS"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"مُسجَّل"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"غير مُسجَّل"</string>
 </resources>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index aa7b528..2eed345 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi-Fi MAC ünvanı"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth ünvanı"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Seriya nömrəsi"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Əlçatmazdır"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Müddəti"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Oyaq vaxtı"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Daxili yaddaş"</string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Əl vasitəsi ilə sinxronizasiya alınmır"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Bu element üçün sinxronlaşma hazırda deaktiv edilibş Bu ayarı dəyişmək üçün müvəqqəti olaraq fon datasını və avtomatik sinxronlaşmanı aktivləşdirin."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC ünvanı"</string>
     <string name="enter_password" msgid="8035706727471334122">"Androidə başlamaq üçün parolu daxil edin"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Androidə başlamaq üçün PIN-i daxil edin"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Androidə başlamaq üçün modeli çəkin"</string>
@@ -3055,8 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Ekran qapalı olduğu zaman"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Ekran açıq və ya qapalı olduğu zaman"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Bildiriş ayarları"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"Ok"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Bu cihaz haqqında fikrinizi bildirin"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Admin PIN kodunu daxil edin"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Aktiv"</string>
@@ -3308,8 +3304,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Sistem ayarlarını dəyişdirə bilər"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Sistem ayarlarında dəyişiklik edin"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"Tətbiqin sistem ayarlarını dəyişdirmə icazəsi"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"Sistem ayarlarının redaktəsinə icazə verin"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Bu icazə tətbiqə sistem ayarlarını dəyişdirməyə imkan verir."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Bəli"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Xeyr"</string>
@@ -3730,7 +3725,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Yeni planşetiniz ilə tanış olun"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Yeni cihazınız ilə tanış olun"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Bu funksiya artıq bu cihazda əlçatan deyil"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"IMS qeydiyyat statusu"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"Qeydiyyatlı"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Qeydiyyatsız"</string>
 </resources>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index f204afe..9c58d5a 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -1172,7 +1172,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi-Fi MAC adresa"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth adresa"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Serijski broj"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Nedostupno"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Vreme rada"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Vreme buđenja"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Interno skladište"</string>
@@ -2370,8 +2369,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Ručno sinhronizovanje nije moguće"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Sinhronizacija za ovu stavku je trenutno onemogućena. Da biste promenili ovo podešavanje, privremeno uključite pozadinske podatke i automatsku sinhronizaciju."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC adresa"</string>
     <string name="enter_password" msgid="8035706727471334122">"Da biste pokrenuli Android, unesite lozinku"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Da biste pokrenuli Android, unesite PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Da biste pokrenuli Android, nacrtajte šablon"</string>
@@ -3088,8 +3085,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Kada je ekran isključen"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Kada je ekran uključen ili isključen"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Podešavanja obaveštenja"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"Potvrdi"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Šalji povratne informacije o uređaju"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Unesite PIN administratora"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Uključeno"</string>
@@ -3348,8 +3344,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Mogu da menjaju podešavanja sistema"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Menjanje podešavanja sistema"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"Dozvola za menjanje podešavanja sistema za aplikaciju"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"Dozvoli menjanje podešavanja sistema"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Ova dozvola dozvoljava aplikaciji da menja podešavanja sistema."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Da"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Ne"</string>
@@ -3786,7 +3781,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Upoznajte novi tablet"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Upoznajte novi uređaj"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Ova funkcija nije dostupna na ovom uređaju."</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"Status IMS registracije"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"Registrovan je"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Nije registrovan"</string>
 </resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 261d77f..8674f69 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -1186,7 +1186,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"MAC-адрас Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Адрас Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Парадкавы нумар"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Адсутнічае"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Час працы пасля апошняй загрузкі"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Час пераходу ў актыўны рэжым"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Унутраная памяць"</string>
@@ -2392,8 +2391,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Немагчыма сінхранізаваць уручную"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Сінхранізацыя для гэтага элемента зараз адключаная. Каб змяніць налады, часова дазвольце абмен дадзенымі ў фонавым рэжыме і аўтаматычную сінхранізацыю."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC-адрас"</string>
     <string name="enter_password" msgid="8035706727471334122">"Каб запусціць Android, увядзіце пароль"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Каб запусціць Android, увядзіце PIN-код"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Каб запусціць Android, увядзіце графічны ключ"</string>
@@ -3122,8 +3119,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Калі экран выключаны"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Калі экран уключаны або выключаны"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Налады апавяшчэнняў"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"ОК"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Адправіць водгук пра гэту прыладу"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Увядзіце PIN-код адміністратара"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Уключана"</string>
@@ -3844,7 +3840,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Аглядны тур па новаму планшэту"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Аглядны тур па новай прыладзе"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Гэта функцыя недаступная на гэтай прыладзе"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"Стан рэгістрацыі IMS"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"Зарэгістраваны"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Не зарэгістраваны"</string>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 97ddf03..2b38db3 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"MAC адрес за Wi‑Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Адрес на Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Сериен номер"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Няма данни"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Време на активност"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Време на активност"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Вътрешно хранилище"</string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Не може да се синхронизира ръчно"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Синхронизирането за този елемент понастоящем е деактивирано. За да промените настройката, временно включете данните на заден план и автоматичното синхронизиране."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"MAC адрес за 4G"</string>
     <string name="enter_password" msgid="8035706727471334122">"За да стартирате Android, въведете паролата си"</string>
     <string name="enter_pin" msgid="5305333588093263790">"За да стартирате Android, въведете ПИН кода си"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"За да стартирате Android, начертайте фигурата си"</string>
@@ -3055,8 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"При изключен екран"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"При включен или изключен екран"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Настройки за известяване"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"OK"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Отзиви за устройството"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Въведете администраторския ПИН код"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Включено"</string>
@@ -3308,8 +3304,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Възможност за промяна на системните настройки"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Промяна на сист. настройки"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"Промяна на системните настройки от приложения"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"Разрешаване на промяна на сист. настройки"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Това разрешение позволява на дадено приложение да променя системните настройки."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Да"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Не"</string>
@@ -3730,7 +3725,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Запознайте се с новия си таблет"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Запознайте се с новото си устройство"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Тази функция не е налице на устройството"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"Състояние на регистрацията за незабавни съобщения"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"Регистрирано"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Не е регистрирано"</string>
 </resources>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 3df4264..13114f5 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"ওয়াই-ফাই MAC ঠিকানা"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"ব্লুটুথ ঠিকানা"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"ক্রমিক সংখ্যা"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"অনুপলব্ধ"</string>
     <string name="status_up_time" msgid="7294859476816760399">"আপ টাইম"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"জাগ্রত সময়"</string>
     <string name="internal_memory" msgid="9129595691484260784">"ইন্টারনাল স্টোরেজ"</string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"ম্যানুয়ালি সমন্বয় করা যাবে না"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"এই আইটেমটির জন্য সিঙ্ক বর্তমানে অক্ষম। এই সেটিং পরিবর্তন করতে, অস্থায়ীভাবে ব্যাকগ্রাউন্ড ডেটা এবং স্বয়ংক্রিয় সিঙ্ক চালু করুন।"</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC ঠিকানা"</string>
     <string name="enter_password" msgid="8035706727471334122">"Android শুরু করার জন্য, আপনার পাসওয়ার্ড লিখুন"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Android শুরু করার জন্য, আপনার পিন লিখুন"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Android শুরু করার জন্য, আপনার প্যাটার্ন আঁকুন"</string>
@@ -3055,8 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"যখন স্ক্রীন বন্ধ থাকে"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"যখন স্ক্রীন চালু বা বন্ধ থাকে"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"বিজ্ঞপ্তির সেটিংস"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"ঠিক আছে"</string>
     <string name="device_feedback" msgid="3238056036766293294">"এই ডিভাইসের সম্পর্কে মতামত পাঠান"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"প্রশাসকের পিন লিখুন"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"চালু করুন"</string>
@@ -3730,7 +3726,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"আপনার নতুন ট্যাবলেট চালিয়ে দেখুন"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"আপনার নতুন ডিভাইস চালিয়ে দেখুন"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"এই বৈশিষ্ট্যটি এই ডিভাইসে উপলব্ধ নেই"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"IMS রেজিস্ট্রেশনের স্থিতি"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"রেজিস্টার করা"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"রেজিস্টার করা নয়"</string>
 </resources>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 851853c..1549989 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -1172,7 +1172,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"MAC adresa Wi-Fi mreže"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth adresa"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Serijski broj"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Nije dostupno"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Vrijeme aktivnosti"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Vrijeme aktivnosti"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Interna pohrana"</string>
@@ -1385,7 +1384,7 @@
     <string name="master_clear_progress_text" msgid="6559096229480527510">"Pričekajte..."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Postavke poziva"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Postavite govornu poštu, prosljeđivanje poziva, poziv na čekanju, ID pozivaoca"</string>
-    <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB dijeljenje veze"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"Povezivanje mobitela USB-om"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Prijenosna pristupna tačka"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Dijeljenje Bluetooth veze"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Dijeljenje veze"</string>
@@ -2370,8 +2369,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Nije moguće ručno sinhronizovati"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Sinhroniziranje za ovu stavku trenutno nije moguće. Da biste promijenili ovu postavku, privremeno uključite podatke u pozadini i automatsko sinhroniziranje."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC adresa"</string>
     <string name="enter_password" msgid="8035706727471334122">"Da biste pokrenuli Android, unesite lozinku"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Da biste pokrenuli Android, unesite PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Da biste pokrenuli Android, nacrtajte svoj obrazac"</string>
@@ -3088,8 +3085,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Kada je ekran isključen"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Kada je ekran isključen ili uključen"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Postavke za obavještenja"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"Uredu"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Slanje informacija o uređaju"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Upišite PIN administratora"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Uključeno"</string>
@@ -3348,8 +3344,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Mogu mijenjati postavke sistema"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Izmjeni postavke sistema"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"Dozvola za izmjenu postavki sistema aplikacije"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"Dozvoli izmjenu postavki sistema"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Ovo odobrenje omogućava aplikaciji da izmijeni postavke sistema."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Da"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Ne"</string>
@@ -3786,7 +3781,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Upoznajte se s novim tabletom"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Upoznajte se s novim uređajem"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Ova funkcija nije dostupna na ovom uređaju"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"Stanje IMS registracije"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"Registrirano"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Nije registrirano"</string>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 4751d56..87cb7ed 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Adreça MAC de Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Adreça de Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Número de sèrie"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"No disponible"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Temps actiu"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Temps d\'activació"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Emmagatzematge intern"</string>
@@ -1853,7 +1852,7 @@
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Retard abans del clic"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ACTIVAT"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"DESACTIVADA"</string>
-    <string name="enable_quick_setting" msgid="2366999897816894536">"Mostra a Configuració ràpida"</string>
+    <string name="enable_quick_setting" msgid="2366999897816894536">"Mostra a configuració ràpida"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Mode de correcció"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
       <item quantity="other">Retard molt breu (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"No es pot sincronitzar manualment"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"En aquest moment, la sincronització d\'aquest element no està disponible. Per canviar la preferència, activa temporalment les dades en segon pla i la sincronització automàtica."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"adreça MAC 4G"</string>
     <string name="enter_password" msgid="8035706727471334122">"Per iniciar Android, introdueix la contrasenya."</string>
     <string name="enter_pin" msgid="5305333588093263790">"Per iniciar Android, introdueix el PIN."</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Per iniciar Android, dibuixa el patró."</string>
@@ -3055,8 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Quan la pantalla està desactivada"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Quan la pantalla està activada o desactivada"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Configuració de les notificacions"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"D\'acord"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Envia suggeriments sobre el dispositiu"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Introdueix el PIN d\'administrador"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Activat"</string>
@@ -3308,8 +3304,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Pot modificar la configuració del sistema"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Modificar configuració sistema"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"Permís aplicació per modificar configuració sistema"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"Permet modificar la configuració del sistema"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Aquest permís permet que una aplicació modifiqui la configuració del sistema."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Sí"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"No"</string>
@@ -3516,7 +3511,7 @@
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Connectat a <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Connectat a diversos dispositius"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Mode de demostració de la IU del sistema"</string>
-    <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Camps de configuració ràpida per a desenvolupadors"</string>
+    <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Mosaics de configuració ràpida per a desenvolupadors"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Som aquí per ajudar-te"</string>
     <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Estem a la teva disposició les 24 hores del dia"</string>
     <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"Estem a la teva disposició les 24 hores del dia"</string>
@@ -3730,7 +3725,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Dona una ullada a la teva tauleta nova"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Dona una ullada al teu dispositiu nou"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Aquesta funció no està disponible en aquest dispositiu"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"Estat del registre d\'IMS"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"Registrat"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Sense registrar"</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index d35e059..1ef2a89 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -1185,7 +1185,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Adresa MAC sítě Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Adresa Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Sériové číslo"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Není k dispozici"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Doba provozu"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Doba provozu"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Interní úložiště"</string>
@@ -2391,8 +2390,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Nelze ručně synchronizovat"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Synchronizace této položky je aktuálně deaktivována. Chcete-li nastavení změnit, dočasně zapněte přenos dat na pozadí a automatickou synchronizaci."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"Adresa MAC sítě 4G"</string>
     <string name="enter_password" msgid="8035706727471334122">"Chcete-li spustit Android, zadejte heslo"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Chcete-li spustit Android, zadejte PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Chcete-li spustit Android, nakreslete gesto"</string>
@@ -3121,8 +3118,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Při vypnuté obrazovce"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Při zapnuté i vypnuté obrazovce"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Nastavení oznámení"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"OK"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Odeslat zpětnou vazbu o tomto zařízení"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Zadejte PIN administrátora"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Zapnuto"</string>
@@ -3388,8 +3384,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Smí měnit nastavení systému"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Změny nastavení systému"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"Oprávnění aplikace ke změnám nastavení systému"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"Povolit úpravy nastavení systému"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Toto oprávnění umožňuje aplikaci měnit nastavení systému."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Ano"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Ne"</string>
@@ -3842,7 +3837,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Prohlédněte si svůj nový tablet"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Prohlédněte si své nové zařízení"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Funkce v tomto zařízení není k dispozici"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"Stav registrace IMS"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"Registrováno"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Neregistrováno"</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index a7064cd..d1fa223 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"MAC-adresse for Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth-adresse"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Serienummer"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Utilgængelig"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Oppetid"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Aktivtid"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Intern lagerplads"</string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Der kan ikke synkroniseres manuelt"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Synkronisering af dette element er deaktiveret lige nu. Hvis du vil ændre indstillingen, skal du aktivere baggrundsdata og automatisk synkronisering midlertidigt."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC-adresse"</string>
     <string name="enter_password" msgid="8035706727471334122">"Start Android ved at indtaste din adgangskode"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Start Android ved at indtaste din pinkode"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Start Android ved at tegne dit mønster"</string>
@@ -2775,7 +2772,7 @@
     <string name="keywords_text_to_speech_output" msgid="5150660047085754699">"hastighed, sprog, standard, tale, indtaling, tts, hjælpefunktion, skærmlæser, blind"</string>
     <string name="keywords_date_and_time" msgid="758325881602648204">"ur, militærtid"</string>
     <string name="keywords_network_reset" msgid="6024276007080940820">"nulstil, gendan, fabriksdata"</string>
-    <string name="keywords_factory_data_reset" msgid="5894970373671252165">"slet, slet, gendan, ryd, fjern"</string>
+    <string name="keywords_factory_data_reset" msgid="5894970373671252165">"ryd, slet, gendan, rens, fjern"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"printer"</string>
     <string name="keywords_sounds" msgid="7146245090127541167">"højttalerbip"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"forstyr ikke, afbryd, afbrydelse, pause"</string>
@@ -3055,8 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Når skærmen er slukket"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Når skærmen er tændt eller slukket"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Indstillinger for underretninger"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"OK"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Send feedback om denne enhed"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Indtast administratorpinkoden"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Til"</string>
@@ -3724,13 +3720,10 @@
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Slå lagerstyring fra?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"Film- og tv-apps"</string>
     <string name="carrier_provisioning" msgid="4398683675591893169">"Oplysninger om mobilselskab"</string>
-    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Udløs mobilselskab"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Aktivér mobilselskab"</string>
     <string name="new_device_suggestion_title" msgid="698847081680980774">"Hvad er nyt og spændende?"</string>
     <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Få en rundvisning på din nye telefon"</string>
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Få en rundvisning på din nye tablet"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Få en rundvisning på din nye enhed"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Denne funktion er ikke tilgængelig på denne enhed"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"Status for IMS-registrering"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"Registreret"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Ikke registreret"</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 4dbb376..aa9a622 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"WLAN-MAC-Adresse"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth-Adresse"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Seriennummer"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Nicht verfügbar"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Betriebszeit"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Aktivzeit"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Interner Speicher"</string>
@@ -1719,7 +1718,7 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Systemdienst beenden?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Wenn du diesen Dienst beendest, funktionieren möglicherweise einige Funktionen deines Tablets nicht mehr richtig, bis du es aus- und wieder einschaltest."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Wenn du diesen Dienst beendest, funktionieren möglicherweise einige Funktionen deines Telefons nicht mehr richtig, bis du es aus- und wieder einschaltest."</string>
-    <string name="language_input_gesture_title" msgid="8749227808244881255">"Sprachen, Eingabe &amp; Gesten"</string>
+    <string name="language_input_gesture_title" msgid="8749227808244881255">"Sprachen, Eingabe &amp; Bewegungen"</string>
     <string name="language_input_gesture_summary_on_with_assist" msgid="7219895055450633449"></string>
     <string name="language_input_gesture_summary_on_non_assist" msgid="756147879200943161"></string>
     <string name="language_input_gesture_summary_off" msgid="4617198819416948217"></string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Manuelle Synchronisierung nicht möglich"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Die Synchronisierung hierfür ist deaktiviert. Zur Änderung dieser Einstellung aktiviere vorübergehend die Hintergrunddaten und die automatische Synchronisierung."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G-MAC-Adresse"</string>
     <string name="enter_password" msgid="8035706727471334122">"Gib dein Passwort ein, um Android zu starten."</string>
     <string name="enter_pin" msgid="5305333588093263790">"Gib deine PIN ein, um Android zu starten."</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Zeichne dein Muster, um Android zu starten."</string>
@@ -2989,7 +2986,7 @@
     <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Regel konfigurieren"</string>
     <string name="zen_schedule_rule_type_name" msgid="142936744435271449">"Zeitregel"</string>
     <string name="zen_schedule_rule_enabled_toast" msgid="3379499360390382259">"Automatische Regel zur Aktivierung des Status \"Nicht stören\" zu bestimmten Zeiten eingestellt"</string>
-    <string name="zen_event_rule_type_name" msgid="2645981990973086797">"Ereignisregel"</string>
+    <string name="zen_event_rule_type_name" msgid="2645981990973086797">"Terminregel"</string>
     <string name="zen_event_rule_enabled_toast" msgid="6910577623330811480">"Automatische Regel zur Aktivierung des Status \"Nicht stören\" während bestimmter Ereignisse eingestellt"</string>
     <string name="zen_mode_event_rule_calendar" msgid="8787906563769067418">"Während Terminen für"</string>
     <string name="zen_mode_event_rule_summary_calendar_template" msgid="5135844750232403975">"Während Terminen für <xliff:g id="CALENDAR">%1$s</xliff:g>"</string>
@@ -3055,8 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Bei deaktiviertem Display"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Bei aktiviertem oder deaktiviertem Display"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Benachrichtigungseinstellungen"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"Ok"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Feedback zu diesem Gerät senden"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Administrator-PIN eingeben"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"An"</string>
@@ -3730,7 +3726,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Lass dir zeigen, was dein neues Tablet alles kann"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Lass dir zeigen, was dein neues Gerät alles kann"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Diese Funktion ist auf diesem Gerät nicht verfügbar"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"IMS-Registrierungsstatus"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"Registriert"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Nicht registriert"</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 8e650c0..402716f 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Διεύθυνση MAC Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Διεύθυνση Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Σειριακός αριθμός"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Μη διαθέσιμο"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Χρόνος από την τελευταία εκκίνηση"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Χρόνος αφύπνισης"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Εσωτερικός αποθηκευτικός χώρος"</string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Δεν είναι δυνατός ο μη αυτόματος συγχρονισμός"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Ο συγχρονισμός για αυτό το στοιχείο είναι προς το παρόν απενεργοποιημένος. Για να αλλάξετε τη ρύθμισή σας, ενεργοποιήστε προσωρινά τα δεδομένα παρασκηνίου και τον αυτόματο συγχρονισμό."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"Διεύθυνση 4G MAC"</string>
     <string name="enter_password" msgid="8035706727471334122">"Για να ξεκινήσετε το Android, εισαγάγετε τον κωδικό σας"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Για να ξεκινήσετε το Android, εισαγάγετε το PIN σας"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Για να ξεκινήσετε το Android, σχεδιάστε το μοτίβο σας"</string>
@@ -3055,8 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Όταν η οθόνη είναι απενεργοποιημένη"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Όταν η οθόνη είναι ενεργοποιημένη ή απενεργοποιημένη"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Ρυθμίσεις ειδοποιήσεων"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"ΟΚ"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Αποστολή σχολίων για τη συσκευή"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Εισαγωγή PIN διαχειριστή"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Ενεργό"</string>
@@ -3730,7 +3726,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Περιηγηθείτε στο νέο σας tablet"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Περιηγηθείτε στη νέα συσκευή σας"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Αυτή η λειτουργία δεν είναι διαθέσιμη σε αυτήν τη συσκευή"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"Κατάσταση εγγραφής υπηρεσίας IMS"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"Εγγεγραμμένη"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Μη εγγεγραμμένη"</string>
 </resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 81f71c1..052d078 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi‑Fi MAC address"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth address"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Serial number"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Unavailable"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Uptime"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Awake time"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Internal storage"</string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Cannot sync manually"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Sync for this item is currently disabled. To change your preference, temporarily turn on background data and automatic sync."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC address"</string>
     <string name="enter_password" msgid="8035706727471334122">"To start Android, enter your password"</string>
     <string name="enter_pin" msgid="5305333588093263790">"To start Android, enter your PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"To start Android, draw your pattern"</string>
@@ -3307,8 +3304,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Can modify system settings"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Modify system settings"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"App modify system settings permission"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"Allow modifying system settings"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"This permission allows an app to modify system settings."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Yes"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"No"</string>
@@ -3729,7 +3725,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Take a tour of your new tablet"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Take a tour of your new device"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"This feature is not available on this device"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"IMS registration state"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"Registered"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Not registered"</string>
 </resources>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index ac12738..c2b5fc3 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi‑Fi MAC address"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth address"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Serial number"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Unavailable"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Uptime"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Awake time"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Internal storage"</string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Cannot sync manually"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Sync for this item is currently disabled. To change your preference, temporarily turn on background data and automatic sync."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC address"</string>
     <string name="enter_password" msgid="8035706727471334122">"To start Android, enter your password"</string>
     <string name="enter_pin" msgid="5305333588093263790">"To start Android, enter your PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"To start Android, draw your pattern"</string>
@@ -3307,8 +3304,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Can modify system settings"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Modify system settings"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"App modify system settings permission"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"Allow modifying system settings"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"This permission allows an app to modify system settings."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Yes"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"No"</string>
@@ -3729,7 +3725,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Take a tour of your new tablet"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Take a tour of your new device"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"This feature is not available on this device"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"IMS registration state"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"Registered"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Not registered"</string>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 81f71c1..052d078 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi‑Fi MAC address"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth address"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Serial number"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Unavailable"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Uptime"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Awake time"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Internal storage"</string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Cannot sync manually"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Sync for this item is currently disabled. To change your preference, temporarily turn on background data and automatic sync."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC address"</string>
     <string name="enter_password" msgid="8035706727471334122">"To start Android, enter your password"</string>
     <string name="enter_pin" msgid="5305333588093263790">"To start Android, enter your PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"To start Android, draw your pattern"</string>
@@ -3307,8 +3304,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Can modify system settings"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Modify system settings"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"App modify system settings permission"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"Allow modifying system settings"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"This permission allows an app to modify system settings."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Yes"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"No"</string>
@@ -3729,7 +3725,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Take a tour of your new tablet"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Take a tour of your new device"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"This feature is not available on this device"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"IMS registration state"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"Registered"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Not registered"</string>
 </resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 81f71c1..052d078 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi‑Fi MAC address"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth address"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Serial number"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Unavailable"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Uptime"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Awake time"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Internal storage"</string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Cannot sync manually"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Sync for this item is currently disabled. To change your preference, temporarily turn on background data and automatic sync."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC address"</string>
     <string name="enter_password" msgid="8035706727471334122">"To start Android, enter your password"</string>
     <string name="enter_pin" msgid="5305333588093263790">"To start Android, enter your PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"To start Android, draw your pattern"</string>
@@ -3307,8 +3304,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Can modify system settings"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Modify system settings"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"App modify system settings permission"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"Allow modifying system settings"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"This permission allows an app to modify system settings."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Yes"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"No"</string>
@@ -3729,7 +3725,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Take a tour of your new tablet"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Take a tour of your new device"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"This feature is not available on this device"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"IMS registration state"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"Registered"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Not registered"</string>
 </resources>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index 25bd9a2..0ce3e48 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -1158,7 +1158,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‏‎‎‎‏‏‏‏‏‏‎‎‏‏‏‏‎‏‎‎‏‏‏‏‏‎‏‏‎‎‏‏‎‎‎‎‏‏‎‎‎‏‏‏‎‎‏‎‏‏‎‎‎‎‏‎‎Wi‑Fi MAC address‎‏‎‎‏‎"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‎‏‏‏‎‎‎‎‏‎‎‎‎‎‎‏‎‏‏‎‎‏‏‎‏‏‎‎‎‏‎‎‏‎‎‎‎‏‎‎‎‎‏‏‎‎‏‎‏‏‎‏‎‎‎‎Bluetooth address‎‏‎‎‏‎"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‎‏‎‏‎‎‏‎‏‏‎‏‏‏‏‎‏‎‏‎‏‎‎‏‏‎‎‏‏‏‏‏‏‎‎‏‏‎‏‏‎‎‏‏‎‏‎‏‎‎‏‎‏‎‎‏‎Serial number‎‏‎‎‏‎"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‏‏‎‏‏‎‏‏‏‎‏‏‏‏‎‎‏‎‎‎‎‎‏‏‎‏‎‏‏‎‏‎‎‎‎‎‏‏‎‏‎‎‏‏‎‏‎‏‎‎‎‏‎‎Unavailable‎‏‎‎‏‎"</string>
     <string name="status_up_time" msgid="7294859476816760399">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎‏‏‏‏‎‎‏‎‎‎‏‏‎‎‎‎‎‎‏‎‏‏‎‏‎‏‏‎‏‎‎‎‎‎‏‏‏‎‎‎‎‎‏‏‏‎‎‏‎‎‏‏‏‏‎Up time‎‏‎‎‏‎"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‎‎‏‏‏‎‎‏‎‎‎‎‎‏‎‎‏‏‎‎‎‎‏‎‎‎‏‏‎‎‏‏‎‎‎‏‎‎‏‏‎‎‎‏‎‎‏‎‎‎‏‎‎‏‎‎‎Awake time‎‏‎‎‏‎"</string>
     <string name="internal_memory" msgid="9129595691484260784">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‎‏‏‎‏‎‏‏‎‏‏‏‎‏‎‎‏‎‎‏‎‎‏‎‏‏‏‎‏‏‎‏‏‎‎‏‎‏‎‎‏‏‎‏‏‎‎‎‎‎Internal storage‎‏‎‎‏‎"</string>
@@ -2348,8 +2347,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‏‎‎‎‏‎‏‎‏‎‏‏‏‎‏‏‏‏‎‎‏‎‎‎‎‎‎‏‏‏‎‏‏‏‏‏‏‎‎‏‎‎‎‎‏‏‎‎‎‏‎‎‏‏‎‏‎Can’t manually sync‎‏‎‎‏‎"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‏‏‏‎‎‏‏‎‏‎‎‎‎‎‏‎‏‎‏‏‏‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‏‏‏‏‎‏‎‏‎‎‎‎‎‎‎‎‏‎Sync for this item is currently disabled. To change this setting, temporarily turn on background data and automatic sync.‎‏‎‎‏‎"</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‏‏‎‏‏‎‎‎‏‏‏‏‎‎‏‏‎‏‎‎‏‏‏‎‎‎‎‏‎‏‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‏‏‏‏‎4G‎‏‎‎‏‎"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‎‎‏‎‎‎‎‏‎‏‎‎‏‎‏‏‏‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‏‎‎‏‏‏‎‏‏‏‎‎‎‏‎‏‎‎‎‎4G MAC address‎‏‎‎‏‎"</string>
     <string name="enter_password" msgid="8035706727471334122">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‎‎‏‎‎‏‎‎‏‎‎‎‎‏‎‏‏‎‎‎‏‏‎‎‏‎‎‏‎‎‎‏‎‎‏‎‏‎‏‎‎‎‎‏‎‏‏‏‎‏‎‏‎‎To start Android, enter your password‎‏‎‎‏‎"</string>
     <string name="enter_pin" msgid="5305333588093263790">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‏‏‎‏‎‎‎‎‎‎‏‎‏‎‏‎‎‏‏‎‎‏‎‏‎‎‎‎‏‏‏‎‏‎‎‏‏‏‏‏‏‎‏‎‏‏‏‏‏‏‎‏‎‏‏‏‎‎To start Android, enter your PIN‎‏‎‎‏‎"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‎‎‏‏‏‎‎‏‏‎‎‎‎‏‎‏‎‎‏‏‎‎‎‎‏‎‏‎‎‏‏‎‏‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‏‏‎‏‏‎‎To start Android, draw your pattern‎‏‎‎‏‎"</string>
@@ -3306,8 +3303,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‎‏‏‏‎‏‏‏‎‏‎‎‎‎‎‎‏‎‎‎‎‏‎‎‏‏‎‎‏‏‏‎‎‎‏‎‏‏‎‏‎‏‏‏‏‎‏‏‏‎‎‏‏‎‎‎Can modify system settings‎‏‎‎‏‎"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‎‏‎‏‎‏‎‏‏‏‎‎‏‎‏‏‎‏‏‏‎‏‎‏‎‎‎‏‎‏‏‏‎‎‏‎‏‎‎‎‏‎‎‏‏‏‏‎‎‎‏‏‏‎‏‏‎Modify system settings‎‏‎‎‏‎"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‏‎‎‏‎‎‏‎‏‏‏‎‏‎‎‏‏‎‏‎‎‏‎‏‎‏‎‏‏‎‎‏‏‎‎‎‏‎‏‎‏‏‏‎‏‏‏‏‎‏‏‏‎‎‎‎App modify system settings permission‎‏‎‎‏‎"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‎‎‏‎‎‎‏‏‏‎‏‎‏‎‎‎‎‏‎‎‏‎‏‎‎‎‎‎‏‎‎‎‏‎‏‏‎‎‏‎‏‏‏‎‎‏‏‎‎‎‎‏‎‎‏‏‎Allow modifying system settings‎‏‎‎‏‎"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‎‏‎‎‎‏‎‎‎‏‎‏‎‎‏‏‏‏‎‎‏‎‏‎‎‏‎‏‎‏‏‎‎‎‎‏‏‎‎‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‎This permission allows an app to modify system settings.‎‏‎‎‏‎"</string>
     <string name="write_settings_on" msgid="8230580416068832239">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‏‏‏‎‎‎‏‏‏‎‎‏‎‏‎‏‎‎‎‏‏‏‏‏‏‎‏‎‏‏‎‎‎‏‎‎‎‏‏‏‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎Yes‎‏‎‎‏‎"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎‎‎‏‏‏‎‎‎‏‎‏‎‎‏‏‎‎‏‏‏‏‎‎‏‎‏‎‏‎‎‏‎‎‏‎‎‏‏‏‎‏‏‏‎‏‏‏‏‏‎‏‎‎‏‎No‎‏‎‎‏‎"</string>
@@ -3728,7 +3724,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‎‏‏‏‎‏‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‎‎‏‏‎‏‏‏‏‎‎‎‎‏‎‏‏‎‏‎‏‏‏‎‏‎‎‎‎‎‏‏‎‎‎Take a tour of your new tablet‎‏‎‎‏‎"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‏‏‎‎‏‏‎‎‏‎‎‎‎‏‎‎‎‎‏‏‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‏‎‏‏‎‎‏‎‎‏‏‏‎‎‎‎‎‏‏‎‎‎Take a tour of your new device‎‏‎‎‏‎"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‎‎‎‏‎‎‎‎‎‏‎‎‏‎‎‎‏‏‎‎‎‏‎‎‏‏‎‎‏‏‏‎‏‏‎‏‏‏‏‏‏‎‎‏‏‎‎‏‎‏‏‎‎‎‎‎‎This feature is not available on this device‎‏‎‎‏‎"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‏‏‎‏‏‎‏‏‎‎‎‎‏‎‎‎‏‏‎‎‏‏‏‏‎‎‏‎‎‎‏‏‏‎‎‎‎‏‎‎‎‎‏‏‎‏‏‏‎‎‎‏‏‎IMS registration state‎‏‎‎‏‎"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‏‏‏‏‎‎‏‎‏‎‏‏‎‎‎‏‏‎‎‏‎‎‏‎‏‏‎‏‎‎‎‎‎‎‎‎‏‎‎‏‏‎‎‎‎‎‎‎‎‏‏‏‎‏‎‎‎Registered‎‏‎‎‏‎"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‏‎‎‏‏‏‏‎‎‏‏‏‎‎‏‏‏‎‏‏‏‏‏‎‏‏‏‎‎‏‏‎‏‎‏‏‎‎‏‎‎‏‏‎‎‏‎‏‏‎‏‎‏‏‏‎‎Not registered‎‏‎‎‏‎"</string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 5bd8c6c..58d5539 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -905,7 +905,7 @@
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Desactivando zona…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> está activa"</string>
     <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"Error en la zona Wi-Fi portátil"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Configurar la zona Wi-Fi"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Configurar hotspot Wi-Fi"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Configuración de zona Wi-Fi"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"Hotspot WPA2 PSK de AndroidAP"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Android Hotspot"</string>
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Dirección MAC de Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Dirección de Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Número de serie"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"No disponible"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Tiempo de actividad"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Hora de actividad"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Almacenamiento interno"</string>
@@ -1562,7 +1561,7 @@
     <string name="screen_compatibility_label" msgid="663250687205465394">"Compatibilidad de la pantalla"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Permisos"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Memoria caché"</string>
-    <string name="clear_cache_btn_text" msgid="5756314834291116325">"Eliminar memoria caché"</string>
+    <string name="clear_cache_btn_text" msgid="5756314834291116325">"Borrar caché"</string>
     <string name="cache_size_label" msgid="7505481393108282913">"Memoria caché"</string>
     <plurals name="uri_permissions_text" formatted="false" msgid="3983110543017963732">
       <item quantity="other">%d elementos</item>
@@ -1587,7 +1586,7 @@
     <string name="auto_launch_enable_text" msgid="4275746249511874845">"Has elegido lanzar esta aplicación de manera predeterminada para algunas acciones."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="566822577792032925">"Decidiste permitir que esta aplicación pueda crear widgets y acceder a sus datos."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"No hay configuraciones predeterminadas establecidas."</string>
-    <string name="clear_activities" msgid="7408923511535174430">"Eliminar configuraciones predeterminadas"</string>
+    <string name="clear_activities" msgid="7408923511535174430">"Borrar valores predeterminados"</string>
     <string name="screen_compatibility_text" msgid="1616155457673106022">"Es posible que esta aplicación no se haya diseñado para tu pantalla. Aquí puedes controlar cómo se ajusta a la pantalla."</string>
     <string name="ask_compatibility" msgid="7225195569089607846">"Preguntar cuando se lanza"</string>
     <string name="enable_compatibility" msgid="5806819252068617811">"Aplicación en escala"</string>
@@ -1691,9 +1690,9 @@
     <skip />
     <string name="running_process_item_user_label" msgid="3129887865552025943">"Usuario: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"Usuario eliminado"</string>
-    <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> procesos y <xliff:g id="NUMSERVICES">%2$d</xliff:g> servicios"</string>
-    <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> procesos y <xliff:g id="NUMSERVICES">%2$d</xliff:g> servicios"</string>
-    <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> procesos <xliff:g id="NUMSERVICES">%2$d</xliff:g> servicio"</string>
+    <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proceso y <xliff:g id="NUMSERVICES">%2$d</xliff:g> servicio"</string>
+    <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proceso y <xliff:g id="NUMSERVICES">%2$d</xliff:g> servicios"</string>
+    <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> procesos y <xliff:g id="NUMSERVICES">%2$d</xliff:g> servicio"</string>
     <string name="running_processes_item_description_p_p" msgid="1607384595790852782">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> procesos y <xliff:g id="NUMSERVICES">%2$d</xliff:g> servicios"</string>
     <string name="running_processes_header_title" msgid="6588371727640789560">"Memoria del dispositivo"</string>
     <string name="running_processes_header_footer" msgid="723908176275428442">"RAM usada por las aplicaciones"</string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"No se puede sincronizar manualmente"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"La sincronización de este elemento actualmente está desactivada. Para cambiar tu configuración, activa momentáneamente los datos en segundo plano y la sincronización automática."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"Dirección MAC de 4G"</string>
     <string name="enter_password" msgid="8035706727471334122">"Para iniciar el dispositivo Android, ingresa la contraseña."</string>
     <string name="enter_pin" msgid="5305333588093263790">"Para iniciar el dispositivo Android, ingresa el PIN."</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Para iniciar el dispositivo Android, dibuja el patrón."</string>
@@ -3053,8 +3050,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Cuando la pantalla está apagada"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Cuando la pantalla está encendida o apagada"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Configuración de notificaciones"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"Aceptar"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Envía comentarios del dispositivo"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Ingresa el PIN de administrador"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Activado"</string>
@@ -3728,7 +3724,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Descubre tu nueva tablet"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Descubre tu nuevo dispositivo"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"La función no está disponible en este dispositivo"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"Estado de registro de IMS"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"Registrado"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Sin registrar"</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index dc14477..abec520 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Dirección MAC de la red Wi‑Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Dirección de Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Número de serie"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"No disponible"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Tiempo de actividad"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Tiempo de actividad"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Almacenamiento interno"</string>
@@ -1547,7 +1546,7 @@
     <string name="applications_settings" msgid="5281808652705396152">"Información de las aplicaciones"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Administrar aplicaciones y configurar accesos directos de inicio rápido"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Ajustes de aplicación"</string>
-    <string name="install_applications" msgid="4872012136210802181">"Orígenes desconocidos"</string>
+    <string name="install_applications" msgid="4872012136210802181">"Fuentes desconocidas"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Permitir todas las fuentes"</string>
     <string name="recent_app_category_title" msgid="6673071268966003928">"Aplicaciones abiertas recientemente"</string>
     <string name="see_all_apps_title" msgid="1317153498074308438">"Ver todas las aplicaciones (<xliff:g id="COUNT">%1$d</xliff:g>)"</string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"No se puede hacer la sincronización de forma manual."</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"La sincronización de este elemento no está disponible en este momento. Para modificar tu preferencia, activa temporalmente los datos en segundo plano y la sincronización automática."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"Dirección MAC 4G"</string>
     <string name="enter_password" msgid="8035706727471334122">"Para iniciar tu dispositivo Android, introduce tu contraseña"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Para iniciar tu dispositivo Android, introduce el PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Para iniciar tu dispositivo Android, dibuja tu patrón"</string>
@@ -3055,8 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Con la pantalla desactivada"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Con la pantalla activada o desactivada"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Ajustes de notificaciones"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"Aceptar"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Enviar sugerencias sobre el dispositivo"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Introducir el PIN del administrador"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Activado"</string>
@@ -3730,7 +3726,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Descubre tu nuevo tablet"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Descubre tu nuevo dispositivo"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Esta función no está disponible en este dispositivo"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"Estado del registro de IMS"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"Registrado"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"No registrado"</string>
 </resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index fb52cd2..8072f4e 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"WiFi MAC-aadress"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetoothi aadress"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Seerianumber"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Pole saadaval"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Talitlusaeg"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Sisselülitusaeg"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Sisemälu"</string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Ei saa käsitsi sünkroonida"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Selle üksuse sünkroonimine on praegu keelatud. Seade muutmiseks lülitage ajutiselt sisse taustaandmed ja automaatne sünkroonimine."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC-aadress"</string>
     <string name="enter_password" msgid="8035706727471334122">"Androidi käivitamiseks sisestage parool"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Androidi käivitamiseks sisestage oma PIN-kood"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Androidi käivitamiseks joonistage muster"</string>
@@ -3055,8 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Kui ekraan on väljas"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Kui ekraan on sees või väljas"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Märguandeseaded"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"OK"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Seadme kohta tagasiside saatmine"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Sisestage administraatori PIN-kood"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Sees"</string>
@@ -3730,7 +3726,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Tutvuge oma uue tahvelarvutiga"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Tutvuge oma uue seadmega"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Sellel seadmel pole see funktsioon saadaval"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"IMS-i registreerimise olek"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"Registreeritud"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Ei ole registreeritud"</string>
 </resources>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 3bd2b39..71ce20e 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi‑Fi MAC helbidea"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth helbidea"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Serie-zenbakia"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Ez dago erabilgarri"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Berrabiarazi ondoren abian izandako denbora"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Aktibo egondako denbora"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Barneko memoria"</string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Ezin da eskuz sinkronizatu"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Elementua ezin da unean desgaitu. Ezarpena aldatzeko, aktibatu atzeko planoko datuak eta sinkronizazio automatikoa aldi baterako."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC helbidea"</string>
     <string name="enter_password" msgid="8035706727471334122">"Android gailua abiarazteko, idatzi pasahitza"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Android gailua abiarazteko, idatzi PIN kodea"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Android gailua abiarazteko, marraztu eredua"</string>
@@ -3055,8 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Pantaila itzalita dagoenean"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Pantaila piztuta nahiz itzalita dagoenean"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Jakinarazpen-ezarpenak"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"Ados"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Bidali gailu honi buruzko iritzia"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Idatzi administratzailearen PIN kodea"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Aktibatuta"</string>
@@ -3308,8 +3304,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Sistemaren ezarpenak alda ditzaketenak"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Aldatu sistemaren ezarpenak"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"Aplikazioek sistemaren ezarpenak aldatzeko baimena"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"Baimendu sistemaren ezarpenak aldatzea"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Baimen honekin, sistemaren ezarpenak alda ditzakete aplikazioek."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Bai"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Ez"</string>
@@ -3730,7 +3725,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Eman txango bat tableta berrian barrena"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Eman txango bat gailu berrian barrena"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Eginbidea ez dago erabilgarri gailu honetan"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"IMS erregistratzearen egoera"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"Erregistratuta"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Erregistratu gabe"</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index de57a16..0ec20ad 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"‏آدرس Wi-Fi MAC"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"آدرس بلوتوث"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"شمارهٔ سریال"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"در دسترس نیست"</string>
     <string name="status_up_time" msgid="7294859476816760399">"زمان فعالیت"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"زمان بیداری"</string>
     <string name="internal_memory" msgid="9129595691484260784">"حافظهٔ داخلی"</string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"نمی‌توان به‌صورت دستی همگام‌سازی کرد"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"همگام‌سازی برای این مورد در حال حاضر غیرفعال است. برای تغییر این تنظیم، داده‌های پس‌زمینه و همگام‌سازی خودکار را موقتاً روشن کنید."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"‏آدرس 4G MAC"</string>
     <string name="enter_password" msgid="8035706727471334122">"‏برای شروع Android، گذرواژه‌تان را وارد کنید"</string>
     <string name="enter_pin" msgid="5305333588093263790">"‏برای شروع Android، پینتان را وارد کنید"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"‏برای شروع Android، الگویتان را رسم"</string>
@@ -3055,8 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"وقتی صفحه‌نمایش روشن است"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"وقتی صفحه‌نمایش روشن یا خاموش است"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"تنظیمات اعلان"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"تأیید"</string>
     <string name="device_feedback" msgid="3238056036766293294">"ارسال بازخورد درباره این دستگاه"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"پین سرپرست را وارد کنید"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"روشن"</string>
@@ -3730,7 +3726,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"در رایانه لوحی جدیدتان گشتی بزنید"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"در دستگاه جدیدتان گشتی بزنید"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"این ویدیو در این دستگاه دردسترس نیست."</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"‏وضعیت ثبت IMS"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"ثبت‌شده"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"ثبت نشده است"</string>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index c0dc2cb..0c8c979 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi-Fi-yhteyden MAC-osoite"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth-osoite"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Sarjanumero"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Ei käytettävissä"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Käynnissäoloaika"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Käytössäoloaika"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Sisäinen tallennustila"</string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Manuaalinen synkronointi epäonnistui"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Tämän kohteen synkronointi on tällä hetkellä pois käytöstä. Voit muuttaa asetuksia ottamalla taustatiedonsiirron ja automaattisen synkronoinnin väliaikaisesti käyttöön."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC -osoite"</string>
     <string name="enter_password" msgid="8035706727471334122">"Käynnistä Android kirjoittamalla salasana"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Käynnistä Android kirjoittamalla PIN-koodi"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Käynnistä Android piirtämällä kuvio"</string>
@@ -3055,8 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Kun näyttö on pois päältä"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Kun näyttö on päällä tai pois päältä"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Ilmoitusasetukset"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"OK"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Lähetä palautetta tästä laitteesta"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Anna järjestelmänvalvojan PIN-koodi"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Käytössä"</string>
@@ -3730,7 +3726,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Tutustu uuteen tablettiisi"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Tutustu uuteen laitteeseesi"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Ominaisuus ei ole käytettävissä tällä laitteella."</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"IMS-rekisteröinnin tila"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"Rekisteröity"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Ei rekisteröity"</string>
 </resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 75b71b2..79d0a88 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Adresse MAC Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Adresse Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Numéro de série"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Non accessible"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Durée d\'activité"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Temps en activité"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Mémoire de stockage interne"</string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Impossible de procéder à la synchronisation manuelle."</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"La synchronisation de cet élément est actuellement désactivée. Pour modifier ce paramètre, activez temporairement les données en arrière-plan et la synchronisation automatique."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"Adresse MAC 4G"</string>
     <string name="enter_password" msgid="8035706727471334122">"Pour lancer Android, entrez votre mot de passe"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Pour lancer Android, entrez votre NIP"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Pour lancer Android, dessinez votre schéma."</string>
@@ -3055,8 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Lorsque l\'écran est éteint"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Quand l\'écran est allumé ou éteint"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Paramètres de notification"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"OK"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Commentaires sur cet appareil"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Entrez le NIP d\'administrateur"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Activé"</string>
@@ -3730,7 +3726,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Découvrez votre nouvelle tablette"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Découvrez votre nouvel appareil"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Cette fonctionnalité n\'est pas accessible sur cet appareil."</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"État d\'enregistrement IMS"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"Enregistré"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Non enregistré"</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 2aca836..4370ad0 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Adresse MAC Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Adresse Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Numéro de série"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Non disponible"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Durée d\'activité"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Temps en activité"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Mémoire de stockage interne"</string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Impossible de procéder à la synchronisation manuelle."</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"La synchronisation de cet élément est actuellement désactivée. Pour modifier ce paramètre, activez temporairement les données en arrière-plan et la synchronisation automatique."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"Adresse MAC 4G"</string>
     <string name="enter_password" msgid="8035706727471334122">"Pour lancer Android, saisissez votre mot de passe."</string>
     <string name="enter_pin" msgid="5305333588093263790">"Pour lancer Android, saisissez votre code PIN."</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Pour lancer Android, dessinez votre schéma."</string>
@@ -3055,8 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Lorsque l\'écran est éteint"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Lorsque l\'écran est allumé ou éteint"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Paramètres de notification"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"OK"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Envoyer commentaires sur appareil"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Saisir le code d\'accès administrateur"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Activé"</string>
@@ -3730,7 +3726,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Découvrez votre nouvelle tablette"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Découvrez votre nouvel appareil"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Cette fonctionnalité n\'est pas disponible sur cet appareil"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"État de l\'enregistrement IMS"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"Enregistré"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Non enregistré"</string>
 </resources>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 23673dc..fb862bc 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Enderezo MAC da wifi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Enderezo Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Número de serie"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Non dispoñible"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Tempo activo"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Tempo de actividade"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Almacenamento interno"</string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Non se pode sincronizar manualmente"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"A sincronización deste elemento está desactivada actualmente. Para cambiar esta configuración, activa temporalmente os datos en segundo plano e a sincronización automática."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"Enderezo MAC 4G"</string>
     <string name="enter_password" msgid="8035706727471334122">"Para iniciar o dispositivo Android, introduce o teu contrasinal"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Para iniciar o dispositivo Android, introduce o teu PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Para iniciar o dispositivo Android, debuxa o teu padrón"</string>
@@ -3055,8 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Coa pantalla desactivada"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Coa pantalla activada ou desactivada"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Configuración das notificacións"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"Aceptar"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Enviar comentarios do dispositivo"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Introduce o PIN do administrador"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Activado"</string>
@@ -3308,8 +3304,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Poden modificar a configuración do sistema"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Modificar configuración"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"Permiso para modificar a configuración do sistema"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"Permitir modificar a configuración do sistema"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Con este permiso unha aplicación pode modificar a configuración do sistema."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Si"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Non"</string>
@@ -3730,7 +3725,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Realiza unha visita guiada pola túa nova tableta"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Realiza unha visita guiada polo teu novo dispositivo"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Esta función non está dispoñible neste dispositivo"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"Estado de rexistro de IMS"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"Rexistrado"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Non rexistrado"</string>
 </resources>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 7a480c5..99a8511 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"વાઇ-ફાઇ MAC સરનામું"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"બ્લૂટૂથ સરનામું"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"શૃંખલા ક્રમાંક"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"અનુપલબ્ધ"</string>
     <string name="status_up_time" msgid="7294859476816760399">"ચાલુ થયાનો સમય"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"જાગૃત સમય"</string>
     <string name="internal_memory" msgid="9129595691484260784">"આંતરિક સ્ટોરેજ"</string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"મેન્યુઅલી સમન્વયિત કરી શકાતું નથી"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"આ આઇટમ માટે સિંક હાલમાં અક્ષમ કરેલું છે. આ સેટિંગ બદલવા માટે, બૅકગ્રાઉન્ડ ડેટા અને આપમેળે સિંકને અસ્થાયી ધોરણે ચાલુ કરો."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC સરનામું"</string>
     <string name="enter_password" msgid="8035706727471334122">"Android પ્રારંભ કરવા માટે, તમારો પાસવર્ડ દાખલ કરો"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Android પ્રારંભ કરવા માટે, તમારો પિન દાખલ કરો"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Android પ્રારંભ કરવા માટે, તમારી પૅટર્ન દોરો"</string>
@@ -3055,8 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"જ્યારે સ્ક્રીન બંધ હોય"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"જ્યારે સ્ક્રીન ચાલુ કે બંધ હોય"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"સૂચનાઓની સેટિંગ્સ"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"ઓકે"</string>
     <string name="device_feedback" msgid="3238056036766293294">"આ ઉપકરણ વિશે પ્રતિસાદ મોકલો"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"વ્યવસ્થાપક પિન દાખલ કરો"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"ચાલુ"</string>
@@ -3730,7 +3726,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"તમારા નવા ટેબ્લેટની ઓળખ મેળવો"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"તમારા નવા ઉપકરણની ઓળખ મેળવો"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"આ ઉપકરણ પર આ સુવિધા ઉપલબ્ધ નથી"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"IMS રજિસ્ટ્રેશનની સ્થિતિ"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"રજિસ્ટર કરેલ"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"રજિસ્ટર કરેલ નથી"</string>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 60f67b6..2bf1552 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"वाई-फ़ाई  MAC पता"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"ब्लूटूथ पता"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"सीरियल नंबर"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"अनुपलब्ध"</string>
     <string name="status_up_time" msgid="7294859476816760399">"चालू रहने का समय"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"सचेत समय"</string>
     <string name="internal_memory" msgid="9129595691484260784">"मोबाइल मेमोरी"</string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"मैन्युअल रूप से समन्वयित नहीं कर सकता"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"इस आइटम के लिए समन्वयन वर्तमान में अक्षम है. यह सेटिंग बदलने के लिए, पृष्ठभूमि डेटा और स्वचालित समन्वयन को अस्थायी रूप से चालू करें."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC पता"</string>
     <string name="enter_password" msgid="8035706727471334122">"Android प्रारंभ करने के लिए, अपना पासवर्ड डालें"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Android प्रारंभ करने के लिए, अपना पिन डालें"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Android प्रारंभ करने के लिए, अपना प्रतिमान लिखें"</string>
@@ -3055,8 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"स्क्रीन के बंद होने पर"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"स्क्रीन के चालू या बंद होने पर"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"सूचना सेटिंग"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"ठीक है"</string>
     <string name="device_feedback" msgid="3238056036766293294">"इस डिवाइस के बारे में फ़ीडबैक भेजें"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"व्यवस्थापक पिन डालें"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"चालू"</string>
@@ -3730,7 +3726,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"अपने नए टैबलेट के बारे में अच्छी तरह जानें"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"अपने नए डिवाइस के बारे में अच्छी तरह जानें"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"यह सुविधा इस डिवाइस पर उपलब्ध नहीं है"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"IMS रजिस्ट्रेशन की स्थिति"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"रजिस्टर है"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"रजिस्टर नहीं है"</string>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 27995fb..56c8b16 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -1172,7 +1172,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"MAC adresa Wi-Fi-ja"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth adresa"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Serijski broj"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Nije dostupno"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Vrijeme aktivnosti"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Vrijeme bez mirovanja"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Unutarnja pohrana"</string>
@@ -2370,8 +2369,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Nije moguća ručna sinkronizacija"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Sinkronizacija za tu stavku trenutačno je onemogućena. Da biste promijenili tu postavku, privremeno uključite pozadinske podatke i automatsku sinkronizaciju."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC adresa"</string>
     <string name="enter_password" msgid="8035706727471334122">"Da biste pokrenuli Android, unesite zaporku"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Da biste pokrenuli Android, unesite svoj PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Da biste pokrenuli Android, nacrtajte svoj obrazac"</string>
@@ -3088,8 +3085,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Kada je zaslon isključen"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Kada je zaslon uključen ili isključen"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Postavke obavijesti"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"U redu"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Pošalji povr. informacije o uređaju"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Unesite PIN administratora"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Uključeno"</string>
@@ -3786,7 +3782,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Upoznajte svoj novi tablet"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Upoznajte svoj novi uređaj"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Ova značajka nije dostupna na ovom uređaju"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"Stanje registracije IMS-a"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"Registrirano"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Nije registrirano"</string>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index eae7888..2cda06c 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi-Fi eszköz MAC-címe"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth-cím"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Sorozatszám"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Nem érhető el"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Futásidő"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Készenléti idő"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Belső tárhely"</string>
@@ -2351,8 +2350,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Nem lehet manuálisan szinkronizálni"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Az elem szinkronizálása jelenleg le van tiltva. A beállítás módosításához ideiglenesen kapcsolja be a háttéradatokat és az automatikus szinkronizálást."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC-cím"</string>
     <string name="enter_password" msgid="8035706727471334122">"Az Android indításához írja be jelszavát"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Az Android indításához írja be PIN-kódját"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Az Android indításához rajzolja le mintáját"</string>
@@ -3057,8 +3054,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Ha a képernyő ki van kapcsolva"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Amikor a képernyő be vagy ki van kapcsolva"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Értesítési beállítások"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"OK"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Visszajelzés küldése az eszközről"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Adja meg a rendszergazdai PIN-kódot"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Be"</string>
@@ -3310,8 +3306,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Módosíthatja a rendszerbeállításokat"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Rendszerbeállítások módosítása"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"Alkalmazásengedély rendszerbeállítások módosítására"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"Rendszerbeállítás-módosítások engedélyezése"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Ez az engedély lehetővé teszi az alkalmazás számára a rendszerbeállítások módosítását."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Igen"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Nem"</string>
@@ -3732,7 +3727,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Az új táblagép bemutatójának megtekintése"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Az új eszköz bemutatójának megtekintése"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Ez a funkció nem áll rendelkezésre ezen az eszközön"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"IMS-regisztráció állapota"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"Regisztrált"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Nem regisztrált"</string>
 </resources>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 55000c3..730be89 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi‑Fi MAC հասցե"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth-ի հասցեն"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Հերթական համարը"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Անհասանելի"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Աշխատած ժամանակը"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Արթուն մնալու տևողությունը"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Ներքին պահոց"</string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Հնարավոր չէ ձեռքով համաժամեցնել"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Համաժամեցումը այս տարրի համար այժմ անջատված է: Այս կարգավորումը փոխելու համար ժամանակավորապես միացրեք հետնաշերտի տվյալները և ինքնահամաժամեցումը:"</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC հասցե"</string>
     <string name="enter_password" msgid="8035706727471334122">"Android-ի մեկնարկի համար մուտքագրեք ձեր գաղտնաբառը"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Android-ի մեկնարկի համար մուտքագրեք ձեր PIN-ը"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Android-ի մեկնարկի համար մուտքագրեք ձեր նախշը"</string>
@@ -3055,8 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Երբ էկրանն անջատված է"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Երբ էկրանը միացված կամ անջատված է"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Ծանուցման կարգավորումներ"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"Լավ"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Կարծիք հայտնել սարքի մասին"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Մուտքագրեք ադմինիստրատորի PIN կոդը"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Միացված է"</string>
@@ -3730,7 +3726,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Ծանոթացեք ձեր նոր պլանշետին"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Ծանոթացեք ձեր նոր սարքին"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Տվյալ գործառույթը հասանելի չէ այս սարքի վրա"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"IMS ծառայության գրանցման կարգավիճակը"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"Գրանցված է"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Գրանցված չէ"</string>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 46a0cb4..fb2444a 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -1061,7 +1061,7 @@
     <string name="screensaver_settings_title" msgid="1770575686476851778">"Screen saver"</string>
     <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"Saat mengisi baterai atau dipasang ke dok"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Keduanya"</string>
-    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Saat mengisi daya"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Saat mengisi baterai"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Selagi di dok"</string>
     <string name="screensaver_settings_summary_never" msgid="5165622985174349585">"Tidak pernah"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Mati"</string>
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Alamat MAC Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Alamat bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Nomor seri"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Tidak Tersedia"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Waktu aktif"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Waktu bangun"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Penyimpanan internal"</string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Tidak dapat menyinkronkan secara manual"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Saat ini, sinkronisasi untuk item ini dinonaktifkan. Untuk mengubah setelan ini, aktifkan data latar belakang dan sinkronisasi otomatis untuk sementara."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"Alamat MAC 4G"</string>
     <string name="enter_password" msgid="8035706727471334122">"Untuk memulai Android, masukkan sandi"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Untuk memulai Android, masukkan PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Untuk memulai Android, gambar pola Anda"</string>
@@ -3055,8 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Saat layar nonaktif"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Saat layar aktif atau nonaktif"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Setelan notifikasi"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"Oke"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Kirim masukan tentang perangkat ini"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Masukkan PIN admin"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Aktif"</string>
@@ -3308,8 +3304,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Dapat mengubah setelan sistem"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Ubah setelan sistem"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"Izin mengubah setelan sistem aplikasi"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"Izinkan mengubah setelan sistem"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Izin ini memungkinkan aplikasi mengubah setelan sistem."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Ya"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Tidak"</string>
@@ -3730,7 +3725,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Ikuti tur tentang tablet baru Anda"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Ikuti tur tentang perangkat baru Anda"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Fitur ini tidak tersedia di perangkat"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"Status pendaftaran IMS"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"Terdaftar"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Tidak terdaftar"</string>
 </resources>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index c5f3991..94d8755 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"MAC-vistfang Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth-vistfang"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Raðnúmer"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Ekki tiltækt"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Uppitími"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Vökutími"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Innbyggð geymsla"</string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Ekki er hægt að samstilla handvirkt"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Samstilling fyrir þetta atriði er óvirk sem stendur. Til að breyta þeirri stillingu skaltu kveikja tímabundið á bakgrunnsgögnum og sjálfvirkri samstillingu."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"MAC-vistfang 4G"</string>
     <string name="enter_password" msgid="8035706727471334122">"Sláðu inn aðgangsorðið þitt til að ræsa Android"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Sláðu inn PIN-númerið þitt til að ræsa Android"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Teiknaðu opnunarmynstrið til að ræsa Android"</string>
@@ -3055,8 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Þegar slökkt er á skjánum"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Þegar kveikt eða slökkt er á skjánum"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Tilkynningastillingar"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"Í lagi"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Senda ábendingar um þetta tæki"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Færðu inn PIN-númer kerfisstjóra"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Kveikt"</string>
@@ -3730,7 +3726,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Skoðaðu kynningu á nýju spjaldtölvunni þinni"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Skoðaðu kynningu á nýja tækinu þínu"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Þessi eiginleiki er ekki í boði í þessu tæki"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"Staða IMS-skráningar"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"Skráð"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Ekki skráð"</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 4126949..3c36407 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Indirizzo MAC Wi‑Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Indirizzo Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Numero di serie"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Non disponibile"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Tempo di attività"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Tempo di attività"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Memoria interna"</string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Impossibile sincronizzare manualmente"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Al momento la sincronizzazione di questo elemento non è attiva. Per modificare questa impostazione, attiva temporaneamente i dati in background e la sincronizzazione automatica."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"Indirizzo MAC 4G"</string>
     <string name="enter_password" msgid="8035706727471334122">"Per avviare Android, inserisci la password"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Per avviare Android, inserisci il PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Per avviare Android, traccia la tua sequenza"</string>
@@ -3055,8 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Quando lo schermo è spento"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Quando lo schermo è acceso o spento"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Impostazioni di notifica"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"OK"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Invia feedback sul dispositivo"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Inserisci PIN amministratore"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"On"</string>
@@ -3308,8 +3304,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Possono modificare le impostazioni di sistema"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Modifica impostazioni sistema"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"Autorizzazione modifica impostazioni sistema"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"Consenti modifica impostazioni di sistema"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Questa autorizzazione consente a un\'app di modificare le impostazioni di sistema."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Sì"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"No"</string>
@@ -3730,7 +3725,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Scopri il tuo nuovo tablet"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Scopri il tuo nuovo dispositivo"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Questa funzione non è disponibile su questo dispositivo"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"Stato di registrazione IMS"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"Registrato"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Non registrato"</string>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index c17f4d0..d6ed334 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -1185,7 +1185,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"‏כתובת MAC של Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"‏כתובת Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"מספר סידורי"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"לא זמין"</string>
     <string name="status_up_time" msgid="7294859476816760399">"זמן פעולה"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"משך פעילות"</string>
     <string name="internal_memory" msgid="9129595691484260784">"אחסון פנימי"</string>
@@ -2391,8 +2390,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"לא ניתן לסנכרן באופן ידני"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"אפשרות הסנכרון עבור פריט זה מושבתת כרגע. כדי לשנות את ההגדרה, הפעל באופן זמני את נתוני הרקע והסנכרון האוטומטי."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"‏כתובת ‎4G MAC"</string>
     <string name="enter_password" msgid="8035706727471334122">"‏כדי להפעיל את Android עליך להזין את הסיסמה שלך"</string>
     <string name="enter_pin" msgid="5305333588093263790">"‏כדי להפעיל את Android, הזן את קוד האימות"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"‏כדי להפעיל את Android, שרטט את קו ביטול הנעילה"</string>
@@ -3123,8 +3120,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"כאשר המסך כבוי"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"כאשר המסך מופעל או כבוי"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"הגדרות התראה"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"אישור"</string>
     <string name="device_feedback" msgid="3238056036766293294">"שליחת משוב על המכשיר הזה"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"הזן את קוד הגישה של מנהל המכשיר"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"פועל"</string>
@@ -3844,7 +3840,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"סיור היכרות עם הטאבלט החדש"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"סיור היכרות עם המכשיר החדש"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"התכונה לא זמינה במכשיר הזה"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"‏סטטוס הרשמה ל-IMS"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"רשום"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"לא רשום"</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index c29ade0..97347f5 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi-Fi MACアドレス"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetoothアドレス"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"シリアル番号"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"不明"</string>
     <string name="status_up_time" msgid="7294859476816760399">"稼働時間"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"端末使用時間"</string>
     <string name="internal_memory" msgid="9129595691484260784">"内部ストレージ"</string>
@@ -2353,8 +2352,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"手動では同期できません"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"このアイテムの同期は現在無効になっています。この設定を変更するには、バックグラウンドデータと自動同期を一時的にONにします。"</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MACアドレス"</string>
     <string name="enter_password" msgid="8035706727471334122">"Androidを起動するには、パスワードを入力します"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Androidを起動するには、PINを入力します"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Androidを起動するには、パターンを入力します"</string>
@@ -3059,8 +3056,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"画面が OFF のとき"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"画面が ON または OFF のとき"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"通知設定"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"OK"</string>
     <string name="device_feedback" msgid="3238056036766293294">"この端末についてフィードバックを送信"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"管理者 PIN の入力"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"ON"</string>
@@ -3734,7 +3730,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"新しいタブレットの使い方をご紹介します"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"新しい端末の使い方をご紹介します"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"この機能は、お使いの端末ではご利用いただけません"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"IMS 登録ステータス"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"登録済み"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"未登録"</string>
 </resources>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 5ba5973..3f72838 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi‑Fi MAC მისამართი"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth მისამართი"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"სერიული ნომერი"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"მიუწვდომელია"</string>
     <string name="status_up_time" msgid="7294859476816760399">"მუშაობის დრო"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"მუშაობის დრო"</string>
     <string name="internal_memory" msgid="9129595691484260784">"შიდა მეხსიერება"</string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"შეუძლებელია ერთობლივი სინქრონიზაცია"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"სინქრონიზაცია გამორთულია. პარამეტრების შესაცვლელად დროებით ჩართეთ მონაცემების ფონური და ავტომატური სინქრონიზაცია."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC მისამართი"</string>
     <string name="enter_password" msgid="8035706727471334122">"Android-ის ჩასართავად, შეიყვანეთ თქვენი პაროლი."</string>
     <string name="enter_pin" msgid="5305333588093263790">"Android-ის ჩასართავად, შეიყვანეთ თქვენი PIN."</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Android-ის ჩასართავად, მოხაზეთ თქვენი ნიმუში."</string>
@@ -3055,8 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"გამორთული ეკრანისას"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"ჩართული ან გამორთული ეკრანისას"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"შეტყობინების პარამეტრები"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"კარგი"</string>
     <string name="device_feedback" msgid="3238056036766293294">"გამოხმაურება ამ მოწყობილობის შესახებ"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"შეიყვანეთ ადმინისტრატორის PIN-კოდი"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"ჩართული"</string>
@@ -3308,8 +3304,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"შეუძლია სისტემის პარამეტრების შეცვლა"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"სისტემის პარამეტრების შეცვლა"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"აპის მიერ სისტემის პარამეტრების შეცვლის ნებართვა"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"სისტემის პარამეტრების შეცვლის ნების დართვა"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"ეს ნებართვა უფლებას აძლევს აპს, შეცვალოს სისტემის პარამეტრები."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"კი"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"არა"</string>
@@ -3730,7 +3725,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"ისარგებლეთ თქვენი ახალი ტაბლეტის გაცნობითი ტურით"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"ისარგებლეთ თქვენი ახალი მოწყობილობის გაცნობითი ტურით"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"ამ მოწყობილობაზე ეს ფუნქცია მიუწვდომელია"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"IMS რეგისტრაციის სტატუსი"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"რეგისტრირებული"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"არარეგისტრირებული"</string>
 </resources>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index c61a7e6..16e8400 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi‑Fi MAC мекенжайы"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth мекенжайы"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Сериялық нөмірі"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Қол жетімсіз"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Қосылғаннан бергі жұмыс уақыты"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Ояну уақыты"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Ішкі жад"</string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Қолмен синхрондау мүмкін болмады"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Бұл нысан үшін синхрондау уақытша өшірілген. Бұл параметрді өзгерту үшін артқы шеп деректері мен автоматты сихнрондауды уақытша қосыңыз."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4Г"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4Г MAC мекенжайы"</string>
     <string name="enter_password" msgid="8035706727471334122">"Android құрылғысын іске қосу үшін құпия сөзіңізді енгізіңіз"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Android құрылғысын іске қосу үшін PIN кодын енгізіңіз"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Android құрылғысын іске қосу үшін өрнекті енгізіңіз"</string>
@@ -3055,8 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Экран өшірулі кезде"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Экран қосулы немесе өшірулі кезде"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Хабарландыру параметрлері"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"ОК"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Осы құрылғы туралы пікір жіберу"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Әкімші PIN кодын енгізу"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Қосулы"</string>
@@ -3730,7 +3726,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Жаңа планшеттің ішін аралаңыз"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Жаңа құрылғының ішін аралаңыз"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Бұл мүмкіндік құрылғыда жоқ"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"IMS тіркеу күйі"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"Тіркелген"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Тіркелмеген"</string>
 </resources>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index bc9cf31..13ffad9 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"អាសយដ្ឋាន​ MAC Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"អាសយដ្ឋាន​ប៊្លូធូស"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"លេខ​ស៊េរី"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"មិន​មាន"</string>
     <string name="status_up_time" msgid="7294859476816760399">"រយៈ​ពេល​បើក"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"ពេលវេលា​ភ្ញាក់"</string>
     <string name="internal_memory" msgid="9129595691484260784">"ទំហំ​​ផ្ទុក​ខាង​ក្នុង"</string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"មិន​អាច​ធ្វើ​សម​កាល​កម្ម​ដោយ​ដៃ"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"បច្ចុប្បន្ន​បាន​បិទ​ការ​ធ្វើ​សម​កាល​កម្ម​សម្រាប់​​ធាតុ​នេះ។ ដើម្បី​ប្ដូរ​ការ​កំណត់​នេះ បើក​ទិន្នន័យ​​ផ្ទៃ​ខាង​ក្រោយ និង​ធ្វើ​សម​កាល​កម្ម​​ស្វ័យ​ប្រវត្តិ​ជា​បណ្ដោះអាសន្ន។"</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"អាសយដ្ឋាន 4G MAC"</string>
     <string name="enter_password" msgid="8035706727471334122">"ដើម្បី​ចាប់ផ្ដើម Android បញ្ចូល​ពាក្យ​សម្ងាត់​របស់​អ្នក"</string>
     <string name="enter_pin" msgid="5305333588093263790">"ដើម្បី​ចាប់ផ្ដើម Android បញ្ចូល​កូដ PIN របស់​អ្នក"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"ដើម្បី​ចាប់ផ្ដើម Android គូរ​លំនាំ​របស់​អ្នក"</string>
@@ -3055,8 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"នៅពេលអេក្រង់បិទ"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"នៅពេលអេក្រង់បើក ឬបិទ"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"​កំណត់​ការ​ជូនដំណឹង"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"យល់ព្រម"</string>
     <string name="device_feedback" msgid="3238056036766293294">"ផ្ដល់​មតិ​ស្ថាបនា​អំពី​ឧបករណ៍​នេះ"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"បញ្ចូលកូដ PIN របស់អ្នកគ្រប់គ្រង"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"បើក"</string>
@@ -3730,7 +3726,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"មើលការណែនាំ​ថេប្លេតថ្មីរបស់អ្នក"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"មើលការណែនាំ​ឧបករណ៍ថ្មី​របស់អ្នក"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"មុខងារនេះ​មិនមាន​នៅលើ​ឧបករណ៍​នេះទេ"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"ស្ថានភាព​នៃការ​ចុះឈ្មោះ IMS"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"បាន​ចុះឈ្មោះ"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"មិនបាន​ចុះឈ្មោះ"</string>
 </resources>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 43117bc..67a42e4 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi‑Fi MAC ವಿಳಾಸ"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"ಬ್ಲೂಟೂತ್‌‌ ವಿಳಾಸ"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"ಕ್ರಮ ಸಂಖ್ಯೆ"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"ಲಭ್ಯವಿಲ್ಲ"</string>
     <string name="status_up_time" msgid="7294859476816760399">"ಕಾರ್ಯನಿರತ ಸಮಯ"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"ಎಚ್ಚರಗೊಂಡ ಸಮಯ"</string>
     <string name="internal_memory" msgid="9129595691484260784">"ಆಂತರಿಕ ಸಂಗ್ರಹಣೆ"</string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"ಹಸ್ತಚಾಲಿತವಾಗಿ ಸಿಂಕ್‌ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"ಸಿಂಕ್‌ ಮಾಡುವುದನ್ನು ಈ ಐಟಮ್‌ಗೆ ಪ್ರಸ್ತುತ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ. ಈ ಸೆಟ್ಟಿಂಗ್‌ ಅನ್ನು ಬದಲಾಯಿಸಲು, ಹಿನ್ನೆಲೆ ಡೇಟಾ ಮತ್ತು ಸ್ವಯಂಚಾಲಿತ ಸಿಂಕ್ ಅನ್ನು ತಾತ್ಕಾಲಿಕವಾಗಿ ಆನ್ ಮಾಡಿ."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC ವಿಳಾಸ"</string>
     <string name="enter_password" msgid="8035706727471334122">"Android ಪ್ರಾರಂಭಿಸಲು, ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್‌ ನಮೂದಿಸಿ"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Android ಪ್ರಾರಂಭಿಸಲು, ನಿಮ್ಮ ಪಿನ್‌ ನಮೂದಿಸಿ"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Android ಪ್ರಾರಂಭಿಸಲು, ನಿಮ್ಮ ನಮೂನೆಯನ್ನು ಚಿತ್ರಿಸಿ"</string>
@@ -3055,8 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"ಪರದೆ ಆಫ್ ಆಗಿರುವಾಗ"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"ಪರದೆ ಆನ್ ಅಥವಾ ಆಫ್ ಆಗಿರುವಾಗ"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"ಅಧಿಸೂಚನೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"ಸರಿ"</string>
     <string name="device_feedback" msgid="3238056036766293294">"ಈ ಸಾಧನದ ಕುರಿತು ಪ್ರತಿಕ್ರಿಯೆಯನ್ನು ಕಳುಹಿಸಿ"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"ನಿರ್ವಾಹಕರ ಪಿನ್ ನಮೂದಿಸಿ"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"ಆನ್"</string>
@@ -3730,7 +3726,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"ನಿಮ್ಮ ಹೊಸ ಟ್ಯಾಬ್ಲೆಟ್‌ನ ಬಳಕೆ ಪ್ರಾರಂಭಿಸಿ"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"ನಿಮ್ಮ ಹೊಸ ಸಾಧನದ ಬಳಕೆಯನ್ನು ಪ್ರಾರಂಭಿಸಿ"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"ಈ ಸಾಧನದಲ್ಲಿ ಈ ವೀಡಿಯೊ ಲಭ್ಯವಿಲ್ಲ"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"IMS ನೋಂದಣಿ ಸ್ಥಿತಿ"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"ನೋಂದಾಯಿಸಲಾಗಿದೆ"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"ನೋಂದಾಯಿಸಲಾಗಿಲ್ಲ"</string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 3fff77c..0b1e974 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi-Fi MAC 주소"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"블루투스 주소"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"일련번호"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"사용할 수 없음"</string>
     <string name="status_up_time" msgid="7294859476816760399">"가동 시간"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"무중단 가동 시간"</string>
     <string name="internal_memory" msgid="9129595691484260784">"내부 저장소"</string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"수동으로 동기화할 수 없음"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"현재 이 항목에 대해 동기화를 사용할 수 없습니다. 이 설정을 변경하려면 백그라운드 데이터 및 자동 동기화를 일시적으로 사용하도록 설정하세요."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC 주소"</string>
     <string name="enter_password" msgid="8035706727471334122">"Android를 시작하려면 비밀번호를 입력하세요."</string>
     <string name="enter_pin" msgid="5305333588093263790">"Android를 시작하려면 PIN을 입력하세요."</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Android를 시작하려면 패턴을 그리세요."</string>
@@ -3055,8 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"화면이 꺼져 있을 때"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"화면이 켜져 있든 꺼져 있든 항상"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"알림 설정"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"확인"</string>
     <string name="device_feedback" msgid="3238056036766293294">"이 기기에 대한 의견 보내기"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"관리자 PIN 입력"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"사용"</string>
@@ -3730,7 +3726,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"새 태블릿 둘러보기"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"새 기기 둘러보기"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"이 기기에서 지원하지 않는 기능입니다."</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"IMS 등록 상태"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"등록됨"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"등록되지 않음"</string>
 </resources>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index b5b87d8..a30cfaf 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -1158,7 +1158,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi‑Fi MAC дареги"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth дареги"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Сериялык номери"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Жеткиликсиз"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Иштеген убакыты"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Ойгоо турган убакыт"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Ички эстутум"</string>
@@ -2352,8 +2351,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Кол менен синхрондоштуруу мүмкүн эмес"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Бул үчүн синхрондоштуруу азыр өчүрүлгөн. Бул тууралоону өзгөртүш үчүн, фондук алмашуу жана авто-синхрондоштурууну убактылуу иштетиңиз."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC дареги"</string>
     <string name="enter_password" msgid="8035706727471334122">"Android\'ду иштетүү үчүн, сырсөзүңүздү киргизиңиз"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Android\'ду иштетүү үчүн, PIN\'иңизди киргизиңиз"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Android\'ду иштетүү үчүн, үлгүңүздү чийиңиз"</string>
@@ -3058,8 +3055,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Экран өчүп турганда"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Экран күйүп же өчүп турганда"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Эскертме жөндөөлөрү"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"Жарайт"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Бул түзмөк жөнүндө пикир жөнөтүү"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Администратордун PIN кодун киргизиңиз"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Күйүк"</string>
@@ -3311,8 +3307,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Тутум жөндөөлөрүн өзгөртө алат"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Тутум жөндөөлөрүн өзгөртүү"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"Колдонмонун тутум жөндөөлөрүн өзгөртүү уруксаты"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"Тутум жөндөөлөрүн өзгөртүүгө уруксат берүү"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Мындай уруксат колдонмого тутум жөндөөлөрүн өзгөртүү мүмкүнчүлүгүн берет."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Ооба"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Жок"</string>
@@ -3733,7 +3728,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Жаңы планшетиңизди карап чыгыңыз"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Жаңы түзмөгүңүзду карап чыгыңыз"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Бул функция бул түзмөктө иштебейт"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"IMS каттоо абалы"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"Катталган"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Катталган эмес"</string>
 </resources>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 738d657..7fec7f2 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"ທີ່ຢູ່ Wi-Fi MAC"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"ທີ່ຢູ່ Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"ໝາຍເລກຊີຣຽວ"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"ບໍ່ມີຂໍ້ມູນ"</string>
     <string name="status_up_time" msgid="7294859476816760399">"ເວລາເປີດນຳໃຊ້"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"ເວລາການເຮັດວຽກ"</string>
     <string name="internal_memory" msgid="9129595691484260784">"ບ່ອນຈັດເກັບຂໍ້ມູນພາຍໃນ"</string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"ບໍ່ສາມາດຊິ້ງຂໍ້ມູນເອງໄດ້"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"ການຊິ້ງຂໍ້ມູນຂອງລາຍການນີ້ຖືກປິດຢູ່. ເພື່ອປ່ຽນການຕັ້ງຄ່ານີ້, ໃຫ້ເປິດການນຳໃຊ້ຂໍ້ມູນພື້ນຫຼັງ ແລະການຊິ້ງຂໍ້ມູນອັດຕະໂນມັດຊົ່ວຄາວ."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC address"</string>
     <string name="enter_password" msgid="8035706727471334122">"ເພີ່ມ​ເລີ່ມ​ຕົ້ນ​ໃຊ້ Android, ໃຫ້​ໃສ່​ລະ​ຫັດ​ຜ່ານ​ຂອງ​ທ່ານ"</string>
     <string name="enter_pin" msgid="5305333588093263790">"ເພີ່ມ​ເລີ່ມ​ຕົ້ນ​ໃຊ້ Android, ໃຫ້​​ໃສ່​ລະ​ຫັດ PIN ຂອງ​ທ່ານ"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"ເພີ່ມ​ເລີ່ມ​ຕົ້ນ​ໃຊ້ Android, ໃຫ້​ແຕ້ມ​ຮູບ​ແບບ​ປົດ​ລອກ​ຂອງ​ທ່ານ"</string>
@@ -3055,8 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"ເມື່ອໜ້າຈໍປິດຢູ່"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"ເມື່ອໜ້າຈໍເປີດ ຫຼື ປິດຢູ່"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"​ການ​ຕັ້ງ​ຄ່າ​ການ​ແຈ້ງ​ເຕືອນ"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"ຕົກລົງ"</string>
     <string name="device_feedback" msgid="3238056036766293294">"ສົ່ງ​ຄຳ​ຕິ​ຊົມ​ກ່ຽວ​ກັບ​ອຸ​ປະ​ກອນ​ນີ້"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"ໃສ່ລະຫັດ PIN ຜູ້ເບິ່ງແຍງລະບົບ"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"ເປີດ"</string>
@@ -3730,7 +3726,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"ລອງເບິ່ງແທັບເລັດໃໝ່ຂອງທ່ານ"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"ລອງເບິ່ງອຸປະກອນໃໝ່ຂອງທ່ານ"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"ຄຸນສົມບັດນີ້ບໍ່ສາມາດໃຊ້ໄດ້ໃນອຸປະກອນນີ້ໄດ້"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"ສະຖານະການລົງທະບຽນ IMS"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"ລົງທະບຽນແລ້ວ"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"ບໍ່ໄດ້ລົງທະບຽນ"</string>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index f113c52..75ceb12 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -1185,7 +1185,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"„Wi-Fi“ MAC adresas"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"„Bluetooth“ adresas"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Serijos numeris"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Užimta"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Veikimo laikas"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Veikimo laikas"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Vidinė atmint."</string>
@@ -2391,8 +2390,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Negalima sinchronizuoti neautomatiškai"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Šiuo metu šio elemento sinchronizavimas neleidžiamas. Jei norite pakeisti šį nustatymą, laikinai įjunkite foninius duomenis ir automatinį sinchronizavimą."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC adresas"</string>
     <string name="enter_password" msgid="8035706727471334122">"Jei norite paleisti „Android“, įveskite slaptažodį"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Jei norite paleisti „Android“, įveskite PIN kodą"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Jei norite paleisti „Android“, nupieškite savo šabloną"</string>
@@ -3121,8 +3118,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Kai ekranas išjungtas"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Kai ekranas įjungtas arba išjungtas"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Įspėjimų nustatymai"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"Gerai"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Siųsti atsiliepimą apie šį įrenginį"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Įveskite administratoriaus PIN kodą"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Įjungta"</string>
@@ -3842,7 +3838,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Peržiūrėkite naujo planšetinio kompiuterio apžvalgą"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Peržiūrėkite naujo įrenginio apžvalgą"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Ši funkcija nepasiekiama šiame įrenginyje"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"IMS registracijos būsena"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"Užregistruota"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Neužregistruota"</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index e8aee6c..ae9fa16 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -1172,7 +1172,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi-Fi MAC adrese"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth adrese"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Sērijas numurs"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Nepieejams"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Darbības laiks"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Nomoda laiks"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Iekšējā krātuve"</string>
@@ -2370,8 +2369,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Nevar sinhronizēt manuāli"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Pašlaik ir atspējota šī vienuma sinhronizācija. Lai mainītu šo iestatījumu, īslaicīgi ieslēdziet fona datu lietojumu un automātisko sinhronizāciju."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC adrese"</string>
     <string name="enter_password" msgid="8035706727471334122">"Lai startētu Android ierīci, ievadiet savu paroli"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Lai startētu Android ierīci, ievadiet savu PIN kodu"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Lai startētu Android ierīci, uzzīmējiet savu kombināciju"</string>
@@ -3088,8 +3085,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Kad ekrāns ir izslēgts"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Kad ekrāns ir ieslēgts vai izslēgts"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Paziņojumu iestatījumi"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"Labi"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Sūtīt atsauksmes par šo ierīci"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Ievadiet administratora PIN"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Ieslēgts"</string>
@@ -3786,7 +3782,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Apskatiet savu jauno planšetdatoru"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Apskatiet savu jauno ierīci"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Šī funkcija šajā ierīcē nav pieejama."</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"IMS reģistrācijas statuss"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"Reģistrēts"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Nav reģistrēts"</string>
 </resources>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 8a9ead4..5b96d52 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Адреса на MAC за Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Адреса на Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Сериски број"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Недостапен"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Време од последно рестартирање"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Време на активност"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Внатрешен капацитет"</string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Не може рачно да се синхронизира"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Синхронизирањето за оваа ставка е моментално оневозможено. За да го промените ова подесување, привремено вклучете податоци во заднина и автоматско синхронизирање."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC адреса"</string>
     <string name="enter_password" msgid="8035706727471334122">"За да стартувате Android, внесете ја лозинката"</string>
     <string name="enter_pin" msgid="5305333588093263790">"За да стартувате Android, внесете го PIN-кодот"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"За да стартувате Android, внесете ја шемата"</string>
@@ -3055,8 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Кога екранот е исклучен"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Кога екранот е вклучен или исклучен"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Поставки на известувања"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"Во ред"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Испрати информации за уредот"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Внесете PIN на админстратор"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Вклучено"</string>
@@ -3308,8 +3304,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Може да ги менува поставките на системот"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Менување поставки на системот"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"Дозвола на апликација за менување поставки на систем"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"Дозволи менување на поставките на системот"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Оваа дозвола овозможува апликацијата да менува поставки на системот."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Да"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Не"</string>
@@ -3730,7 +3725,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Запознајте се со новиот таблет"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Запознајте се со новиот уред"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Функцијава не е достапна на овој уред"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"Состојба на IMS-регистрација"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"Регистриран"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Не е регистриран"</string>
 </resources>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 593946a..b32c448 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"വൈഫൈ MAC വിലാസം"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"ബ്ലൂടൂത്ത് വിലാസം"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"സീരിയല്‍ നമ്പര്‍"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"ലഭ്യമല്ല"</string>
     <string name="status_up_time" msgid="7294859476816760399">"പ്രവർത്തിക്കുന്ന സമയം"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"സജീവമായിരിക്കുന്ന സമയം"</string>
     <string name="internal_memory" msgid="9129595691484260784">"ആന്തരിക സ്റ്റോറേജ്"</string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"സ്വമേധയാ സമന്വയിപ്പിക്കാനായില്ല"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"ഈ ഇനത്തിനായുള്ള സമന്വയം നിലവിൽ പ്രവർത്തനരഹിതമാണ്. ഈ ക്രമീകരണം മാറ്റുന്നതിന്, പശ്ചാത്തല ഡാറ്റയും യാന്ത്രിക സമന്വയവും താൽക്കാലികമായി ഓണാക്കുക."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC വിലാസം"</string>
     <string name="enter_password" msgid="8035706727471334122">"Android ആരംഭിക്കുന്നതിന്, നിങ്ങളുടെ പാസ്‌വേഡ് നൽകുക"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Android ആരംഭിക്കുന്നതിന്, നിങ്ങളുടെ പിൻ നൽകുക"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Android ആരംഭിക്കുന്നതിന്, നിങ്ങളുടെ പാറ്റേൺ വരയ്‌ക്കുക"</string>
@@ -3055,8 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"സ്ക്രീൻ ഓഫായിരിയ്ക്കുമ്പോൾ"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"സ്ക്രീൻ ഓണോ ഓഫോ ആയിരിക്കുമ്പോൾ"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"അറിയിപ്പ് ക്രമീകരണങ്ങൾ"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"ശരി"</string>
     <string name="device_feedback" msgid="3238056036766293294">"ഇതേക്കുറിച്ചുള്ള ഫീഡ്‌ബാക്ക് അയയ്‌ക്കൂ"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"അഡ്‌മിൻ പിൻ നൽകുക"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"ഓണാക്കുക"</string>
@@ -3730,7 +3726,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"നിങ്ങളുടെ ‌പുതിയ ‌ടാബ്‌ലെറ്റിനെ അറിയുക‌"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"നിങ്ങളുടെ പുതിയ ഉപകരണത്തെ അറിയുക"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"ഈ ഫീച്ചർ ഈ ഉപകരണത്തിൽ ലഭ്യമല്ല"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"IMS രജിസ്‌ട്രേഷൻ നില"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"രജിസ്റ്റർ ചെയ്‌തു"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"രജിസ്‌റ്റർ ചെയ്‌തിട്ടില്ല"</string>
 </resources>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 4152905..22af7fa 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi-Fi MAC хаяг"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth хаяг"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Сериалын дугаар"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Байхгүй"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Асаалттай байсан хугацаа"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Идэвхтэй байх хугацаа"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Дотоод сан"</string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Гараар синк хийх боломжгүй"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Энэ зүйлийн синкийг одоогоор идэвхгүйжүүлсэн байна. Тохиргоог өөрчлөхийн тулд далд дата болон автомат синкийг түр идэвхжүүлнэ үү."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC хаяг"</string>
     <string name="enter_password" msgid="8035706727471334122">"Андройдыг эхлүүлэхийн тулд нууц үгээ оруулна уу"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Андройдыг эхлүүлэхийн тулд PIN оруулна уу"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Андройдыг эхлүүлэхийн тулд хээгээ зурна уу"</string>
@@ -3053,8 +3050,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Дэлгэц унтарсан үед"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Дэлгэц асаалттай буюу унтраалттай үед"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Мэдэгдлийн тохиргоо"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"Ок"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Энэ төхөөрөмжийн талаар санал илгээх"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Админы ПИН-г оруулах"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Идэвхтэй"</string>
@@ -3728,7 +3724,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Шинэ таблеттай танилцах"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Шинэ төхөөрөмжтэй танилцах"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Энэ онцлог энэ төхөөрөмжид боломжгүй"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"IMS бүртгэлийн байдал"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"Бүртгэсэн"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Бүртгээгүй"</string>
 </resources>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 78a8643..c521720 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"वाय-फाय MAC पत्ता"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"ब्लूटूथ पत्ता"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"सीरीअल नंबर"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"अनुपलब्ध"</string>
     <string name="status_up_time" msgid="7294859476816760399">"चालू असल्याचा कालावधी"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"सक्रिय वेळ"</string>
     <string name="internal_memory" msgid="9129595691484260784">"अंतर्गत स्टोरेज"</string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"व्यक्तिचलितपणे संकालन करू शकत नाही"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"या आयटमसाठी सध्या सिंक अक्षम केले आहे. हे सेटिंग बदलण्यासाठी, पार्श्वभूमीवरील डेटा आणि आपोआप होणारे सिंक तात्पुरते चालू करा."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC पत्ता"</string>
     <string name="enter_password" msgid="8035706727471334122">"Android प्रारंभ करण्‍यासाठी, आपला संकेतशब्द प्रविष्‍ट करा"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Android प्रारंभ करण्‍यासाठी, आपला पिन प्रविष्‍ट करा"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Android प्रारंभ करण्‍यासाठी, आपल्या नमुन्याची रेखाटणी करा"</string>
@@ -3055,8 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"स्क्रीन बंद असताना"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"स्क्रीन चालू किंवा बंद असताना"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"सूचना सेटिंग्ज"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"ठीक"</string>
     <string name="device_feedback" msgid="3238056036766293294">"या डिव्हाइस बद्दल अभिप्राय पाठवा"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"प्रशासक पिन एंटर करा"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"चालू"</string>
@@ -3730,7 +3726,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"तुमच्या नवीन टॅबलेटबद्दल माहिती देणार्‍या सफरीवर चला"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"तुमच्या नवीन डीव्हाइसबद्दल माहिती देणार्‍या सफरीवर चला"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"हे वैशिष्‍ट्य या डिव्हाइसवर उपलब्ध नाही"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"IMS नोंदणी स्थिती"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"नोंदवलेले"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"नोंदवलेले नाही"</string>
 </resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index d249a7b..56b8a8a 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Alamat MAC Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Alamat Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Nombor siri"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Tidak tersedia"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Masa hidup"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Masa berjaga"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Storan dalaman"</string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Tidak boleh menyegerakkan secara manual"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Penyegerakan untuk item ini dilumpuhkan pada masa ini. Untuk menukar tetapan ini, hidupkan data latar belakang dan penyegerakan automatik buat sementara waktu."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"Alamat MAC 4G"</string>
     <string name="enter_password" msgid="8035706727471334122">"Untuk memulakan Android, masukkan kata laluan anda"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Untuk memulakan Android, masukkan PIN anda"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Untuk memulakan Android, lukis corak anda"</string>
@@ -3055,8 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Apabila skrin dimatikan"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Apabila skrin dihidupkan atau dimatikan"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Tetapan pemberitahuan"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"Ok"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Hntr mklm balas mngenai peranti ini"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Masukkan PIN pentadbir"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Dihidupkan"</string>
@@ -3730,7 +3726,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Teroka tablet baharu anda"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Teroka peranti baharu anda"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Video ini tidak tersedia pada peranti ini"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"Keadaan pendaftaran IMS"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"Berdaftar"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Tidak didaftarkan"</string>
 </resources>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index b57846c..042d9dc 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi-Fi ၏ MAC လိပ်စာ"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"ဘလူးတုသ်လိပ်စာ"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"စက်မှတ်ပုံတင်နံပါတ်"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"မရရှိနိုင်ပါ။"</string>
     <string name="status_up_time" msgid="7294859476816760399">"ဖွင့်ထားသောအချိန်"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"ပြန်ပွင့်မည်အချိန်"</string>
     <string name="internal_memory" msgid="9129595691484260784">"စက်တွင်း သိုလှောင်ထားမှု"</string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"ထပ်တူကိုက်ညီရန် လူအားဖြင့်ပြုလုပ်၍မရပါ"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"လက်ရှိဤအရာအား ထပ်တူကိုက်ညီစေရန်ပြုလုပ်မရပါ။ ထိုအပြင်အဆင်အားပြောင်းရန် နောက်ခံဒေတာနှင့် အလိုအလျောက်ထပ်တူကိုက်ညီစေရန်ပြုလုပ်ခြင်းတို့အား ခေတ္တဖွင့်ပါ။"</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC၏လိပ်စာ"</string>
     <string name="enter_password" msgid="8035706727471334122">"အန်ဒရွိုက်ကို စရန်၊ သင်၏ စကားဝှက်ကို ရိုက်ထည့်ပါ"</string>
     <string name="enter_pin" msgid="5305333588093263790">"အန်ဒရွိုက်ကို စရန်၊ သင်၏ PIN ကို ရိုက်ထည့်ပါ"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"အန်ဒရွိုက်ကို စရန်၊ သင်၏ ပုံဆွဲပုံစံကို ရေးဆွဲပါ"</string>
@@ -3055,8 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"မျက်နှာပြင် ပိတ်ထားစဉ်"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"မျက်နှာပြင်ကို ဖွင့်ထားစဉ် သို့မဟုတ် ပိတ်ထားစဉ်"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"အကြောင်းကြားချက် ဆက်တင်များ"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"အိုကေ"</string>
     <string name="device_feedback" msgid="3238056036766293294">"ဤကိရိယာအတွက် အကြံပြုချက် ပို့ရန်"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"စီမံခန့်ခွဲသူ၏ ပင်နံပါတ်ကို ထည့်ပါ"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"ဖွင့်ရန်"</string>
@@ -3308,8 +3304,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"စနစ်ချိန်ညှိချက်များကို ပြန်ပြင်နိုင်သည်"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"စနစ်ဆက်တင်များ ပြန်ပြင်ခြင်း"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"စနစ်ချိန်ညှိချက်များပြန်ပြင်ခြင်း အပ်ဖ်ခွင့်ပြုချက်"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"စက်စနစ် ဆက်တင်များကို ပြင်ဆင်ခွင့် ပြုရန်"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"ဤခွင့်ပြုချက်သည် အပ်ဖ်ကို စနစ်ချိန်ညှိချက်များအား ပြန်ပြင်ခွင့်ပေးသည်။"</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Yes"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"No"</string>
@@ -3730,7 +3725,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"သင်၏တက်ဘလက်အသစ်ကို လေ့လာကြည့်ရှုပါ"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"သင်၏ စက်ပစ္စည်းအသစ်ကို လေ့လာကြည့်ရှုပါ"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"ဤဝန်ဆောင်မှုကို ဤစက်ပစ္စည်းတွင် မရရှိနိုင်ပါ"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"IMS မှတ်ပုံတင်ခြင်း အခြေအနေ"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"မှတ်ပုံတင်ထားသည်"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"မှတ်ပုံတင်မထားပါ"</string>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index bbb8c4b..b419f0b 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"MAC-adresse for Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth-adresse"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Serienummer"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Ikke tilgjengelig"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Oppetid"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Våken tid"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Intern lagring"</string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Kan ikke synkronisere manuelt"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Synkronisering for dette elementet er deaktivert. Hvis du vil endre innstillinger, kan du midlertidig slå på bakgrunnsdata og automatisk synkronisering."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC-adresse"</string>
     <string name="enter_password" msgid="8035706727471334122">"Skriv inn passordet ditt for å starte Android"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Skriv inn PIN-koden din for å starte Android"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Tegn mønsteret ditt for å starte Android"</string>
@@ -3055,8 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Når skjermen er av"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Når skjermen er på eller av"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Varselinnstillinger"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"Ok"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Send tilbakemelding om enheten"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Skriv inn PIN-koden for administrator"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"På"</string>
@@ -3730,7 +3726,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Få en innføring i det nye nettbrettet ditt"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Få en innføring i den nye enheten din"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Denne funksjonen er ikke tilgjengelig på denne enheten"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"Tilstand for IMS-registrering"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"Registrert"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Ikke registrert"</string>
 </resources>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 0f9b096..c6b2597 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi-Fi म्याक ठेगाना"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"ब्लुटुथ ठेगाना"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"क्रम संख्या"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"अनुपलब्ध"</string>
     <string name="status_up_time" msgid="7294859476816760399">"सक्रिय समय"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"जाग्ने समय"</string>
     <string name="internal_memory" msgid="9129595691484260784">"आन्तरिक भण्डारण"</string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"आफैँ सिंक गर्न सकेन।"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"हालका लागि यस वस्तुको सिंक असक्षम पारिएको छ। यस सेटिङलाई परिवर्तन गर्न अस्थायी रूपमा पृष्ठभूमि डेटा र स्वचालित सिंक सक्रिय पार्नुहोस्।"</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC ठेगाना"</string>
     <string name="enter_password" msgid="8035706727471334122">"Android सुरु गर्न, आफ्नो पासवर्ड प्रविष्ट गर्नुहोस्"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Android सुरु गर्न, आफ्नो पिन प्रविष्ट गर्नुहोस्"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Android सुरु गर्न, आफ्नो ढाँचा कोर्नुहोस्"</string>
@@ -3055,8 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"स्क्रिन अफ हुँदा"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"स्क्रिन अन वा अफ हुँदा"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"सूचना सेटिङहरू"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"ठीक छ"</string>
     <string name="device_feedback" msgid="3238056036766293294">"उपकरण बारेमा प्रतिक्रिया पठाउनुहोस्"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"प्रशासकको PIN प्रविष्ट गर्नुहोस्"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"सक्रिय गर्नुहोस्"</string>
@@ -3732,7 +3728,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"आफ्नो नयाँ ट्याब्लेटको बारेमा राम्रोसँग जान्नुहोस्‌"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"आफ्नो नयाँ यन्त्रको बारेमा राम्रोसँग जान्नुहोस्‌"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"यस यन्त्रमा यो सुविधा उपलब्ध छैन"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"IMS दर्ताको स्थिति"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"दर्ता गरिएको"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"दर्ता नगरिएको"</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 56da29a..1da909c 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"MAC-adres voor wifi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth-adres"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Serienummer"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Niet beschikbaar"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Bedrijfstijd"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Stand-bytijd"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Interne opslag"</string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Kan niet handmatig synchroniseren"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Synchroniseren is op dit moment uitgeschakeld voor dit item. Als je deze instelling wilt wijzigen, schakel je achtergrondgegevens en automatisch synchroniseren tijdelijk in."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC-adres"</string>
     <string name="enter_password" msgid="8035706727471334122">"Geef je wachtwoord op om Android te starten"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Geef je pincode op om Android te starten"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Teken je patroon om Android te starten"</string>
@@ -3055,8 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Als scherm uit is"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Als scherm aan of uit is"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Instellingen voor meldingen"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"OK"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Feedback sturen over dit apparaat"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Beheerderspincode invoeren"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Aan"</string>
@@ -3308,8 +3304,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Kan systeeminstellingen aanpassen"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Systeeminstellingen aanpassen"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"App-machtigingen voor aanpassen van systeeminstellingen"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"Aanpassen van systeeminstellingen toestaan"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Met deze rechten kan een app de systeeminstellingen aanpassen."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Ja"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Nee"</string>
@@ -3730,7 +3725,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Een rondleiding volgen voor je nieuwe tablet"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Een rondleiding volgen voor je nieuwe apparaat"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Deze functie is niet beschikbaar op dit apparaat"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"IMS-registratiestatus"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"Geregistreerd"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Niet geregistreerd"</string>
 </resources>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index d2db304..6b7a33e 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"ਵਾਈ‑ਫਾਈ MAC ਪਤਾ"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"ਬਲੂਟੁੱਥ ਪਤਾ"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"ਕ੍ਰਮ ਸੰਖਿਆ"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"ਅਣਉਪਲਬਧ"</string>
     <string name="status_up_time" msgid="7294859476816760399">"ਅੱਪ ਟਾਈਮ"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"ਸਕਿਰਿਆ ਸਮਾਂ"</string>
     <string name="internal_memory" msgid="9129595691484260784">"ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ"</string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"ਮੈਨੂਅਲੀ ਸਿੰਕ ਨਹੀਂ ਕਰ ਸਕਦਾ"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"ਇਸ ਆਈਟਮ ਲਈ ਸਿੰਕ ਇਸ ਵੇਲੇ ਅਸਮਰਥਿਤ ਹੈ। ਇਸ ਸੈਟਿੰਗ ਨੂੰ ਬਦਲਣ ਲਈ, ਪਿਛੋਕੜ  ਡਾਟਾ  ਅਤੇ ਆਟੋਮੈਟਿਕ ਸਿੰਕ ਅਸਥਾਈ ਤੌਰ ਤੇ ਚਾਲੂ ਕਰੋ।"</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC ਪਤਾ"</string>
     <string name="enter_password" msgid="8035706727471334122">"Android ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ, ਆਪਣਾ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰੋ"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Android ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ, ਆਪਣਾ ਪਿੰਨ ਦਾਖਲ ਕਰੋ"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Android ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ, ਆਪਣਾ ਪੈਟਰਨ ਡ੍ਰਾ ਕਰੋ"</string>
@@ -3055,8 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"ਜਦੋਂ ਸਕ੍ਰੀਨ ਬੰਦ ਹੋਵੇ"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"ਜਦੋਂ ਸਕ੍ਰੀਨ ਚਾਲੂ ਜਾਂ ਬੰਦ ਹੋਵੇ"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"ਸੂਚਨਾ ਸੈਟਿੰਗਾਂ"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"ਠੀਕ ਹੈ"</string>
     <string name="device_feedback" msgid="3238056036766293294">"ਇਸ ਡੀਵਾਈਸ ਬਾਰੇ ਵਿਚਾਰ ਭੇਜੋ"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"ਪ੍ਰਸ਼ਾਸਕ ਪਿੰਨ ਦਾਖਲ ਕਰੋ"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"ਚਾਲੂ"</string>
@@ -3730,7 +3726,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"ਆਪਣਾ ਨਵਾਂ ਟੈਬਲੈੱਟ ਵਰਤਣ ਬਾਰੇ ਜਾਣਕਾਰੀ ਪ੍ਰਾਪਤ ਕਰੋ"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Take a tour of your new device"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"ਇਹ ਵਿਸ਼ੇਸ਼ਤਾ ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"IMS ਰਜਿਸਟਰੇਸ਼ਨ ਸਥਿਤੀ"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"ਰਜਿਸਟਰ ਕੀਤੀ ਗਈ"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"ਰਜਿਸਟਰ ਨਹੀਂ ਕੀਤੀ ਗਈ"</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 685a225..1c1ce02 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -615,7 +615,7 @@
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Anuluj"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Dalej"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Konfiguracja została ukończona."</string>
-    <string name="manage_device_admin" msgid="537804979483211453">"Aplikacje do administrowania urządzeniem"</string>
+    <string name="manage_device_admin" msgid="537804979483211453">"Aplikacje do zarządzania urządzeniem"</string>
     <string name="number_of_device_admins_none" msgid="7185056721919496069">"Brak aktywnych aplikacji"</string>
     <plurals name="number_of_device_admins" formatted="false" msgid="3361891840111523393">
       <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> aktywne aplikacje</item>
@@ -1185,7 +1185,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Adres MAC karty Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Adres Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Numer seryjny"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Niedostępny"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Czas działania"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Czas działania (włączony)"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Pamięć wewnętrzna"</string>
@@ -2295,7 +2294,7 @@
     <string name="remove_device_admin" msgid="9207368982033308173">"Dezaktywuj tę aplikację do administrowania urządzeniem"</string>
     <string name="uninstall_device_admin" msgid="271120195128542165">"Odinstaluj aplikację"</string>
     <string name="remove_and_uninstall_device_admin" msgid="3837625952436169878">"Dezaktywuj i odinstaluj"</string>
-    <string name="select_device_admin_msg" msgid="7347389359013278077">"Aplikacje do administrowania urządzeniem"</string>
+    <string name="select_device_admin_msg" msgid="7347389359013278077">"Aplikacje do zarządzania urządzeniem"</string>
     <string name="no_device_admins" msgid="4846602835339095768">"Brak dostępnych aplikacji do administrowania urządzeniem"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Osobiste"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Praca"</string>
@@ -2391,8 +2390,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Nie można zsynchronizować ręcznie"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Synchronizacja tego elementu jest obecnie wyłączona. Aby zmienić ustawienie, tymczasowo włącz obsługę danych w tle i automatyczną synchronizację."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"Adres MAC 4G"</string>
     <string name="enter_password" msgid="8035706727471334122">"Aby uruchomić Androida, wpisz hasło"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Aby uruchomić Androida, wpisz kod PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Aby uruchomić Androida, narysuj wzór"</string>
@@ -3121,8 +3118,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Gdy ekran jest wyłączony"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Gdy ekran jest włączony lub wyłączony"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Ustawienia powiadomień"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"OK"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Prześlij opinię o tym urządzeniu"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Wpisz kod PIN administratora"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Wł."</string>
@@ -3250,7 +3246,7 @@
     <string name="system_app" msgid="9068313769550747372">"(Systemowa)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(Domyślna aplikacja systemu)"</string>
     <string name="apps_storage" msgid="4353308027210435513">"Magazyn aplikacji"</string>
-    <string name="usage_access" msgid="5479504953931038165">"Dostęp do użytkowania"</string>
+    <string name="usage_access" msgid="5479504953931038165">"Dostęp do danych o użyciu"</string>
     <string name="permit_usage_access" msgid="4012876269445832300">"Zezwól na dostęp do użytkowania"</string>
     <string name="app_usage_preference" msgid="7065701732733134991">"Ustawienia użycia aplikacji"</string>
     <string name="usage_access_description" msgid="1352111094596416795">"Dostęp do użytkowania umożliwia aplikacji śledzenie tego, jakich innych aplikacji i jak często używasz, oraz odczytywanie m.in. informacji o operatorze i ustawień językowych."</string>
@@ -3842,7 +3838,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Poznaj swój nowy tablet"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Poznaj swoje nowe urządzenie"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Ta funkcja jest niedostępna na tym urządzeniu."</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"Stan rejestracji IMS"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"Zarejestrowane"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Niezarejestrowane"</string>
 </resources>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 0b5c640..d1c47cf 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Endereço MAC da rede Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Endereço Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Número de série"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Não disponível"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Tempo de atividade"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Tempo ativo"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Armaz. interno"</string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Não é possível sincronizar manualmente"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"A sincronização para o item está desativada no momento. Para alterar essa configuração, ative os dados de segundo plano e a sincronização automática temporariamente."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"Endereço MAC 4G"</string>
     <string name="enter_password" msgid="8035706727471334122">"Para iniciar o Android, digite sua senha"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Para iniciar o Android, digite seu PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Para iniciar o Android, desenhe seu padrão"</string>
@@ -3055,8 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Quando a tela está desativada"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Quando a tela estiver ativada ou desativada"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Configurações de notificação"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"Ok"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Enviar feedback sobre o dispositivo"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Inserir PIN do administrador"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Ativado"</string>
@@ -3308,8 +3304,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Pode modificar configurações do sistema"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Mudar configurações do sistema"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"Permissão p/ app modificar configurações do sistema"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"Permitir modificação de config. do sistema"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Esta permissão permite que um app modifique configurações do sistema."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Sim"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Não"</string>
@@ -3730,7 +3725,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Faça um tour pelo seu novo tablet"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Faça um tour pelo seu novo dispositivo"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Este recurso não está disponível neste dispositivo"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"Estado do registro de IMS"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"Registrado"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Não registrado"</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 3532621..5fe21c5 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Endereço MAC de Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Endereço Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Número de série"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Indisponível"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Tempo de actividade"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Hora de actividade"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Armazenamento interno"</string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Não é possível sincronizar manualmente"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"A sincronização deste item está atualmente desativada. Para alterar esta definição, ative temporariamente os dados de segundo plano e a sincronização automática."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"Endereço MAC de 4G"</string>
     <string name="enter_password" msgid="8035706727471334122">"Para iniciar o Android, introduza a palavra-passe"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Para iniciar o Android, introduza o PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Para iniciar o Android, desenhe o padrão"</string>
@@ -3055,8 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Quando o ecrã está desligado"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Quando o ecrã está ligado ou desligado"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Definições de notificações"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"Ok"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Enviar comentários do dispositivo"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Introduzir o PIN do administrador"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Ativado"</string>
@@ -3308,8 +3304,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Podem modificar as definições do sistema"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Modificar definições sistema"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"Autorização da aplicação para mod. def. do sistema"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"Permitir alteração das definições do sistema"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Esta autorização permite que uma aplicação modifique as definições do sistema."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Sim"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Não"</string>
@@ -3730,7 +3725,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Faça uma visita guiada ao seu novo tablet"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Faça uma visita guiada ao seu novo dispositivo"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Esta funcionalidade não está disponível neste dispositivo."</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"Estado do registo IMS"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"Registado"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Não registado"</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 0b5c640..d1c47cf 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Endereço MAC da rede Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Endereço Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Número de série"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Não disponível"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Tempo de atividade"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Tempo ativo"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Armaz. interno"</string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Não é possível sincronizar manualmente"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"A sincronização para o item está desativada no momento. Para alterar essa configuração, ative os dados de segundo plano e a sincronização automática temporariamente."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"Endereço MAC 4G"</string>
     <string name="enter_password" msgid="8035706727471334122">"Para iniciar o Android, digite sua senha"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Para iniciar o Android, digite seu PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Para iniciar o Android, desenhe seu padrão"</string>
@@ -3055,8 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Quando a tela está desativada"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Quando a tela estiver ativada ou desativada"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Configurações de notificação"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"Ok"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Enviar feedback sobre o dispositivo"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Inserir PIN do administrador"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Ativado"</string>
@@ -3308,8 +3304,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Pode modificar configurações do sistema"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Mudar configurações do sistema"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"Permissão p/ app modificar configurações do sistema"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"Permitir modificação de config. do sistema"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Esta permissão permite que um app modifique configurações do sistema."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Sim"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Não"</string>
@@ -3730,7 +3725,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Faça um tour pelo seu novo tablet"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Faça um tour pelo seu novo dispositivo"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Este recurso não está disponível neste dispositivo"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"Estado do registro de IMS"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"Registrado"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Não registrado"</string>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 2f1c81c..c8caab3 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -1172,7 +1172,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Adresă MAC Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Adresă Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Număr de serie"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Indisponibilă"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Durată de funcționare"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Durată de activitate"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Stocare internă"</string>
@@ -2370,8 +2369,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Sincronizarea manuală nu este posibilă"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"În prezent, sincronizarea pentru acest element este dezactivată. Pentru a schimba această setare, activați temporar datele de fundal și sincronizarea automată."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"Adresă MAC 4G"</string>
     <string name="enter_password" msgid="8035706727471334122">"Pentru a lansa sistemul de operare Android, introduceți parola"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Pentru a lansa sistemul de operare Android, introduceți codul PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Pentru a lansa sistemul de operare Android, desenați șablonul"</string>
@@ -3088,8 +3085,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Când ecranul este dezactivat"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Când ecranul este activat sau dezactivat"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Setări pentru notificări"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"OK"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Trimiteți feedback despre dispoz."</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Introduceți codul PIN de administrator"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Activat"</string>
@@ -3348,8 +3344,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Pot modifica setările de sistem"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Modifică setările de sistem"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"Permisiune aplicație modificare setări de sistem"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"Permiteți modificarea setărilor de sistem"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Având această permisiune, o aplicație poate să modifice setările de sistem."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Da"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Nu"</string>
@@ -3786,7 +3781,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Faceți un tur al noii dvs. tablete"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Faceți un tur al noului dvs. dispozitiv"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Această caracteristică nu este disponibilă pe acest dispozitiv"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"Situația înregistrării IMS"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"Înregistrat"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Neînregistrat"</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 3f9e945..d5d74aa 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -1185,7 +1185,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"MAC-адрес Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Адрес Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Серийный номер"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Недоступно"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Время с момента включения"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Время работы"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Внутренний накопитель"</string>
@@ -2391,8 +2390,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Не удалось синхронизировать данные"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Синхронизация отключена. Чтобы включить ее, временно разрешите передачу данных в фоновом режиме и автоматическую синхронизацию."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"МАС-адрес для 4G"</string>
     <string name="enter_password" msgid="8035706727471334122">"Чтобы запустить Android, введите пароль"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Чтобы запустить Android, введите PIN-код"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Чтобы запустить Android, введите графический ключ"</string>
@@ -3121,8 +3118,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"При отключенном экране"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"При включенном и отключенном экране"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Настройки уведомлений"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"ОК"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Отправить отзыв об устройстве"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Введите PIN-код администратора"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"ВКЛЮЧЕНО"</string>
@@ -3842,7 +3838,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Познакомьтесь со своим новым планшетом"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Познакомьтесь со своим новым устройством"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Функция недоступна на этом устройстве."</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"Статус регистрации сервиса IMS"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"Зарегистрирован"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Не зарегистрирован"</string>
 </resources>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 17fd567..1001673 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi‑Fi MAC ලිපිනය"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"බ්ලූටූත් ලිපිනය"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"අනුක්‍රමාංකය"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"ලබාගත නොහැක"</string>
     <string name="status_up_time" msgid="7294859476816760399">"ක්‍රියාකාරීව ඇති කාලය"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"අවදි වේලාව"</string>
     <string name="internal_memory" msgid="9129595691484260784">"අභ්‍යන්තර ආචයනය"</string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"අතින් සමමුහුර්ත කළ නොහැක"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"මෙම අයිතමය සඳහා සමමුර්ත කිරීම දැනට අබල කර ඇත. මෙම සැකසීම් වෙනස් කිරීමට, තාවකාලිකව පසුබිම් දත්ත සහ ස්වයංක්‍රිය සමමුහුර්තකරණය සක්‍රිය කරන්න."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC ලිපිනය"</string>
     <string name="enter_password" msgid="8035706727471334122">"Android ආරම්භ කිරීමට, ඔබගේ මුරපදය ඇතුළු කරන්න"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Android ආරම්භ කිරීමට, ඔබගේ PIN එක ඇතුළු කරන්න"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Android ආරම්භ කිරීමට, ඔබගේ රටාව අදින්න"</string>
@@ -3055,8 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"තිරය ක්‍රියාවිරහිත විට"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"තිරය ක්‍රියාත්මක හෝ ක්‍රියාවිරහිත විට"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"දැනුම්දීම් සැකසීම්"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"හරි"</string>
     <string name="device_feedback" msgid="3238056036766293294">"මෙම උපාංගය පිළිබඳ ප්‍රතිපෝෂණ යවන්න"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"පරිපාලක PIN එක ඇතුල් කරන්න"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"ක්‍රියාත්මකයි"</string>
@@ -3730,7 +3726,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"ඔබගේ නව ටැබ්ලට් පරිගණකය ගැන දැන ගන්න"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"ඔබගේ නව උපාංගය ගැන දැන ගන්න"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"මෙම අංගය මෙම උපාංගයේ ලබා ගත නොහැක"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"IMS ලියාපදිංචි තත්ත්වය"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"ලියාපදිංචි වී ඇත"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"ලියාපදිංචි වී නැත"</string>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 4a4c6ef..9b61d1b 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -1185,7 +1185,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Adresa MAC siete Wi‑Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Adresa Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Sériové číslo"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Nie je k dispozícii"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Doba prevádzky"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Doba prevádzky"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Interný ukl. priestor"</string>
@@ -2391,8 +2390,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Nie je možné ručne synchronizovať"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Synchronizácia tejto položky je momentálne zakázaná. Ak chcete toto nastavenie zmeniť, dočasne zapnite dátové prenosy na pozadí a automatickú synchronizáciu."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"Adresa 4G MAC"</string>
     <string name="enter_password" msgid="8035706727471334122">"Ak chcete spustiť Android, zadajte heslo."</string>
     <string name="enter_pin" msgid="5305333588093263790">"Ak chcete spustiť Android, zadajte číslo PIN."</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Ak chcete spustiť Android, nakreslite vzor."</string>
@@ -3121,8 +3118,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Keď je obrazovka vypnutá"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Keď je obrazovka zapnutá alebo vypnutá"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Nastavenia upozornení"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"OK"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Spätná väzba o zariadení"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Zadajte PIN správcu"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Zapnuté"</string>
@@ -3842,7 +3838,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Pozrite si prehliadku nového tabletu"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Pozrite si prehliadku nového zariadenia"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Táto funkcia nie je v zariadení k dispozícii"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"Stav registrácie IMS"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"Registrované"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Neregistrované"</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index a47126b..037cf6c 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -1185,7 +1185,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Naslov MAC vmesnika Wi‑Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Naslov Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Serijska številka"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Ni na voljo"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Čas delovanja"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Čas delovanja"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Notranja shramba"</string>
@@ -2391,8 +2390,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Ročna sinhronizacija ni mogoča"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Sinhronizacija za ta element je trenutno onemogočena. Če želite spremeniti nastavitev, vklopite podatke v ozadju in samodejno sinhronizacijo."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"Naslov 4G MAC"</string>
     <string name="enter_password" msgid="8035706727471334122">"Če želite zagnati Android, vnesite geslo"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Če želite zagnati Android, vnesite PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Če želite zagnati Android, narišite vzorec"</string>
@@ -3121,8 +3118,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Ko je zaslon izklopljen"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Ko je zaslon vklopljen ali izklopljen"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Nastavitve obvestil"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"V redu"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Pošlji povratne info. o tej napravi"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Vnos skrbniške kode PIN"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Vklopljeno"</string>
@@ -3842,7 +3838,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Oglejte si predstavitev novega tabličnega računalnika"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Oglejte si predstavitev nove naprave"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Ta funkcija ni na voljo v tej napravi."</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"Stanje registracije IMS"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"Registrirana"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Ni registrirana"</string>
 </resources>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index e170871..91e541e 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -1159,7 +1159,6 @@
     <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_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>
     <string name="status_awake_time" msgid="2393949909051183652">"Koha e zgjimit"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Hapësira e brendshme për ruajtje"</string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Nuk mund të sinkronizojë manualisht"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Sinkronizimi për këtë artikull është aktualisht i çaktivizuar. Për ta ndryshuar këtë cilësim, aktivizo përkohësisht të dhënat në sfond dhe sinkronizimin automatik."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"Adresa 4G MAC"</string>
     <string name="enter_password" msgid="8035706727471334122">"Për të nisur Androidin, fut fjalëkalimin"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Për të nisur Androidin, fut kodin PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Për të nisur Androidin, vizato motivin tënd"</string>
@@ -3055,8 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Kur ekrani është joaktiv"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Kur ekrani është aktiv ose joaktiv"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Cilësimet e njoftimeve"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"Në rregull"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Dërgo përshtypjet për këtë pajisje"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Fut kodin PIN të administratorit"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Aktivizuar"</string>
@@ -3730,7 +3726,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Zhvillo një turne të tabletit tënd të ri"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Zhvillo një turne të pajisjes sate të re"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Ky funksion nuk ofrohet në këtë pajisje"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"Gjendja e regjistrimit të IMS-së"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"Regjistruar"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Paregjistruar"</string>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 91b05e2..b5489ba 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -1172,7 +1172,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi-Fi MAC адреса"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth адреса"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Серијски број"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Недоступно"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Време рада"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Време буђења"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Интерно складиште"</string>
@@ -2370,8 +2369,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Ручно синхронизовање није могуће"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Синхронизација за ову ставку је тренутно онемогућена. Да бисте променили ово подешавање, привремено укључите позадинске податке и аутоматску синхронизацију."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC адреса"</string>
     <string name="enter_password" msgid="8035706727471334122">"Да бисте покренули Android, унесите лозинку"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Да бисте покренули Android, унесите PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Да бисте покренули Android, нацртајте шаблон"</string>
@@ -3088,8 +3085,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Када је екран искључен"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Када је екран укључен или искључен"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Подешавања обавештења"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"Потврди"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Шаљи повратне информације о уређају"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Унесите PIN администратора"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Укључено"</string>
@@ -3348,8 +3344,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Могу да мењају подешавања система"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Мењање подешавања система"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"Дозвола за мењање подешавања система за апликацију"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"Дозволи мењање подешавања система"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Ова дозвола дозвољава апликацији да мења подешавања система."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Да"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Не"</string>
@@ -3786,7 +3781,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Упознајте нови таблет"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Упознајте нови уређај"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Ова функција није доступна на овом уређају."</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"Статус IMS регистрације"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"Регистрован je"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Није регистрован"</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 6187ff5..816df7b 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi-Fi MAC-adress"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth-adress"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Serienummer"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Inte tillgängligt"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Tid sedan systemstart"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Aktiveringstid"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Intern lagring"</string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Det går inte att synkronisera manuellt"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Synkronisering är inaktiverad för det här objektet. Om du vill ändra inställningen aktiverar du bakgrundsdata och automatisk synkronisering tillfälligt."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC-adress"</string>
     <string name="enter_password" msgid="8035706727471334122">"Starta Android genom att ange ditt lösenord"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Starta Android genom att ange din pinkod"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Starta Android genom att rita ditt grafiska lösenord"</string>
@@ -3055,8 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"När skärmen är avstängd"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"När skärmen är påslagen eller avstängd"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Aviseringsinställningar"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"OK"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Skicka feedback om den här enheten"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Ange administratörens pinkod:"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"På"</string>
@@ -3308,8 +3304,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Kan ändra systeminställningar"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Ändra systeminställningar"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"Behörighet för app att ändra systeminställningar"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"Tillåt att systeminställningar ändras"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Med den här behörigheten kan appen ändra systeminställningarna."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Ja"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Nej"</string>
@@ -3730,7 +3725,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Ta en rundtur på din nya surfplatta"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Ta en rundtur på din nya enhet"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Den här funktionen är inte tillgänglig på den här enheten."</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"IMS-registrering"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"Registrerad"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Ej registrerad"</string>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 930acd9..3aaf202 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Anwani ya Wi-Fi ya MAC"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Anwani ya Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Nambari ya Ufuatiliaji"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Hapatikani"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Muda wa matumizi tangu mwisho ilipozimwa"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Saa ya kuamka"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Hifadhi ya ndani"</string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Huwezi kusawazisha mwenyewe"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Kwa sasa usawazishaji wa kipengee hiki umezimwa. Kubadilisha mpangilio huu, washa kwa muda data ya usuli na usawazishaji kiotomatiki."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"Anwani ya 4G MAC"</string>
     <string name="enter_password" msgid="8035706727471334122">"Ili uanzishe Android, weka nenosiri lako"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Ili uanzishe Android, weka PIN yako"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Ili uanzishe Android, chora mchoro wako"</string>
@@ -3055,8 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Wakati skrini imezimwa"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Wakati skrini imezimwa au imewashwa"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Mipangilio ya arifa"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"Sawa"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Tuma maoni kuhusu kifaa hiki"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Weka PIN ya msimamizi"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Imewashwa"</string>
@@ -3730,7 +3726,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Kagua kompyuta yako kibao mpya"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Kagua kifaa chako kipya"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Kipengele hiki hakipatikani kwenye kifaa hiki"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"Hali ya usajili wa IMS"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"Imesajiliwa"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Haijasajiliwa"</string>
 </resources>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index d65507b..6b69626 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"வைஃபை MAC முகவரி"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"புளூடூத் முகவரி"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"வரிசை எண்"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"கிடைக்கவில்லை"</string>
     <string name="status_up_time" msgid="7294859476816760399">"இயங்கிய நேரம்"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"விழிப்பு நேரம்"</string>
     <string name="internal_memory" msgid="9129595691484260784">"அகச் சேமிப்பிடம்"</string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"கைமுறையாக ஒத்திசைக்க முடியாது"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"இந்த உருப்படிக்கான ஒத்திசைவு தற்போது முடக்கப்பட்டுள்ளது. இந்த அமைப்பை மாற்ற, பின்புலத் தரவு மற்றும் தன்னியக்க ஒத்திசைவைத் தற்காலிகமாக இயக்கவும்."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC முகவரி"</string>
     <string name="enter_password" msgid="8035706727471334122">"Androidஐத் தொடங்க, கடவுச்சொல்லை உள்ளிடவும்"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Androidஐத் தொடங்க, PINஐ உள்ளிடவும்"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Androidஐத் தொடங்க, வடிவத்தை வரையவும்"</string>
@@ -3055,8 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"திரை முடக்கப்பட்டிருக்கும் போது"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"திரை இயக்கத்தில் அல்லது முடக்கத்தில் உள்ள போது"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"அறிவிப்பு அமைப்பு"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"சரி"</string>
     <string name="device_feedback" msgid="3238056036766293294">"சாதனம் பற்றி கருத்தை அனுப்பு"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"நிர்வாகிப் பின்னை உள்ளிடவும்"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"ஆன்"</string>
@@ -3730,7 +3726,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"உங்கள் புதிய டேப்லெட்டைப் பற்றி அறிக"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"உங்கள் புதிய சாதனத்தைப் பற்றி அறிக"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"இந்தச் சாதனத்தில் இந்த அம்சம் இல்லை"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"IMS பதிவின் நிலை"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"பதிவு செய்யப்பட்டது"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"பதிவு செய்யப்படவில்லை"</string>
 </resources>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 944a5c0..3e7956d 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi‑Fi MAC చిరునామా"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"బ్లూటూత్ చిరునామా"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"క్రమ సంఖ్య"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"అందుబాటులో లేదు"</string>
     <string name="status_up_time" msgid="7294859476816760399">"గడిచిన సమయం"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"మేల్కొని ఉన్న సమయం"</string>
     <string name="internal_memory" msgid="9129595691484260784">"అంతర్గత నిల్వ"</string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"మాన్యువల్‌గా సమకాలీకరించడం సాధ్యపడదు"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"ఈ అంశం యొక్క సమకాలీకరణ ప్రస్తుతం నిలిపివేయబడింది. ఈ సెట్టింగ్‌ను మార్చడానికి, నేపథ్య డేటాను మరియు స్వయంచాలక సమకాలీకరణను తాత్కాలికంగా ప్రారంభించండి."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC చిరునామా"</string>
     <string name="enter_password" msgid="8035706727471334122">"Androidని ప్రారంభించడానికి, మీ పాస్‌వర్డ్‌ని నమోదు చేయండి"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Androidని ప్రారంభించడానికి, మీ పిన్‌ను నమోదు చేయండి"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Androidని ప్రారంభించడానికి, మీ నమూనాను గీయండి"</string>
@@ -3055,8 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"స్క్రీన్ ఆఫ్‌లో ఉన్నప్పుడు"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"స్క్రీన్ ఆన్ లేదా ఆఫ్‌లో ఉన్నప్పుడు"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"నోటిఫికేషన్ సెట్టింగ్‌లు"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"సరే"</string>
     <string name="device_feedback" msgid="3238056036766293294">"ఈ పరికరం గురించి అభిప్రాయం పంపండి"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"నిర్వాహకుల పిన్‌ని నమోదు చేయండి"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"ఆన్‌లో ఉంది"</string>
@@ -3731,7 +3727,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"మీ కొత్త టాబ్లెట్ గురించి తెలుసుకోండి"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"మీ కొత్త పరికరం గురించి తెలుసుకోండి"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"ఈ లక్షణం ఈ పరికరంలో అందుబాటులో లేదు"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"IMS నమోదు స్థితి"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"నమోదు చేయబడింది"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"నమోదు కాలేదు"</string>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 540482f..f1aa0fc 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"ที่อยู่ MAC ของ WiFi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"ที่อยู่บลูทูธ"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"หมายเลขซีเรียล"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"ไม่ว่าง"</string>
     <string name="status_up_time" msgid="7294859476816760399">"เวลาใช้งาน"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"เวลาการทำงาน"</string>
     <string name="internal_memory" msgid="9129595691484260784">"ที่เก็บข้อมูลภายใน"</string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"ซิงค์ด้วยตนเองไม่ได้"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"รายการนี้ถูกปิดใช้งานการซิงค์อยู่ หากต้องการเปลี่ยนการตั้งค่า ให้เปิดใช้งานข้อมูลแบ็กกราวด์และการซิงค์อัตโนมัติชั่วคราว"</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"ที่อยู่ MAC ใน 4G"</string>
     <string name="enter_password" msgid="8035706727471334122">"ป้อนรหัสผ่านเพื่อเริ่มต้นใช้งาน Android"</string>
     <string name="enter_pin" msgid="5305333588093263790">"ป้อน PIN เพื่อเริ่มต้นใช้งาน Android"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"วาดรูปแบบเพื่อเริ่มต้นใช้งาน Android"</string>
@@ -3055,8 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"เมื่อหน้าจอปิดอยู่"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"เมื่อหน้าจอเปิดหรือปิดอยู่"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"การตั้งค่าการแจ้งเตือน"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"ตกลง"</string>
     <string name="device_feedback" msgid="3238056036766293294">"ส่งความคิดเห็นเกี่ยวกับอุปกรณ์นี้"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"ป้อน PIN ผู้ดูแลระบบ"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"เปิด"</string>
@@ -3730,7 +3726,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"ทัวร์ชมแท็บเล็ตเครื่องใหม่"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"ทัวร์ชมอุปกรณ์ใหม่"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"ฟีเจอร์นี้ไม่สามารถใช้ได้บนอุปกรณ์นี้"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"สถานะการลงทะเบียน IMS"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"ลงทะเบียนแล้ว"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"ไม่ได้ลงทะเบียน"</string>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 0c1d160..f4fc54c 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"MAC address ng Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Address ng bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Serial number"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Hindi available"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Oras na naka-up"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Oras ng gising"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Panloob na storage"</string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Hindi makapag-sync nang manu-mano"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Kasalukuyang naka-disable ang pag-sync para sa item na ito. Upang baguhin ang setting na ito, pansamantalang i-on ang data ng background at awtomatikong pag-sync."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC address"</string>
     <string name="enter_password" msgid="8035706727471334122">"Upang magsimula sa Android, ilagay ang iyong password"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Upang magsimula sa Android, ilagay ang iyong PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Upang magsimula sa Android, iguhit ang iyong pattern"</string>
@@ -3055,8 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Kapag naka-off ang screen"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Kapag naka-on o naka-off ang screen"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Mga setting ng notification"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"Ok"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Feedback tungkol sa device"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Ilagay ang PIN ng admin"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Naka-on"</string>
@@ -3730,7 +3726,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Maglibot sa iyong bagong tablet"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Maglibot sa iyong bagong device"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Hindi available ang feature na ito sa device na ito"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"Status ng pagpaparehistro ng IMS"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"Nakarehistro"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Hindi nakarehistro"</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 1793a79..fd959a1 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Kablosuz MAC adresi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth adresi"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Seri numara"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Kullanılamıyor"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Açık kalma süresi"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Uyanık geçen süre"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Dahili dep birm"</string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"El ile senkronize edilemez"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Bu öğe için senkronizasyon şu anda devre dışı bırakılmış durumdadır. Bu ayarı değiştirmek için geçici olarak arka plan verilerini ve otomatik senkronizasyonu açın."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC adresi"</string>
     <string name="enter_password" msgid="8035706727471334122">"Android\'i başlatmak için şifrenizi girin"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Android\'i başlatmak için PIN\'inizi girin"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Android\'i başlatmak için deseninizi çizin"</string>
@@ -3055,8 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Ekran kapalıyken"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Ekran kapalıyken veya açıkken"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Bildirim ayarları"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"Tamam"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Bu cihazla ilgili geri bildirim gönder"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Yönetici PIN\'ini girin"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Açık"</string>
@@ -3730,7 +3726,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Yeni tabletinizi tanıyın"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Yeni cihazınızı tanıyın"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Bu özellik bu cihazda kullanılamıyor"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"IMS kaydı durumu"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"Kaydettirildi"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Kaydettirilmedi"</string>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 32a9fc8..477777d 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -1185,7 +1185,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"MAC-адреса Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Адреса Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Серійний номер"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Недоступно"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Час із моменту ввімкнення"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Час активн."</string>
     <string name="internal_memory" msgid="9129595691484260784">"Внутрішня пам\'ять"</string>
@@ -2391,8 +2390,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Неможливо синхронізувати вручну"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Синхронізацію для цього елемента зараз вимкнено. Щоб змінити це налаштування, тимчасово ввімкніть фонові дані й автоматичну синхронізацію."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC-адреса"</string>
     <string name="enter_password" msgid="8035706727471334122">"Введіть пароль, щоб запустити пристрій Android"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Введіть PIN-код, щоб запустити пристрій Android"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Намалюйте ключ, щоб запустити пристрій Android"</string>
@@ -3121,8 +3118,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Коли екран вимкнено"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Коли екран увімкнено або вимкнено"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Налаштування сповіщень"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"ОK"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Надіслати відгук про цей пристрій"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Введіть PIN-код адміністратора"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Увімкнено"</string>
@@ -3388,8 +3384,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Може змінювати налаштування системи"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Змінювати налаштування системи"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"Дозвіл змінювати налаштування системи"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"Дозволити змінювати налаштування системи"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Додаток зможе змінювати налаштування системи."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Так"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Ні"</string>
@@ -3842,7 +3837,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Ознайомтеся зі своїм новим планшетом"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Ознайомтеся зі своїм новим пристроєм"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Ця функція недоступна на цьому пристрої"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"Статус реєстрації IMS"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"Зареєстровано"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Не зареєстровано"</string>
 </resources>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index bfe244f..178f2fa 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"‏Wi‑Fi MAC پتہ"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"بلوٹوتھ پتہ"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"سیریل نمبر"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"غیر دستیاب"</string>
     <string name="status_up_time" msgid="7294859476816760399">"چلنے کا وقت"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"بیداری کا وقت"</string>
     <string name="internal_memory" msgid="9129595691484260784">"داخلی اسٹوریج"</string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"دستی طور پر مطابقت پذیری نہيں کر سکتے"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"اس آئٹم کیلئے مطابقت پذیری فی الحال غیر فعال ہے۔ اس ترتیب کو تبدیل کرنے کیلئے، عارضی طور پر پس منظر ڈیٹا اور خود کار مطابقت پذیری کو آن کریں۔"</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"‏4G MAC پتہ"</string>
     <string name="enter_password" msgid="8035706727471334122">"‏Android کو شروع کرنے کیلئے، اپنا پاس ورڈ درج کریں"</string>
     <string name="enter_pin" msgid="5305333588093263790">"‏Android کو شروع کرنے کیلئے، اپنا PIN درج کریں"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"‏Android کو شروع کرنے کیلئے، اپنا پیٹرن ڈرا کریں"</string>
@@ -3053,8 +3050,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"جب اسکرین آف ہو"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"جب اسکرین آن یا آف ہو"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"اطلاع کی ترتیبات"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"ٹھیک ہے"</string>
     <string name="device_feedback" msgid="3238056036766293294">"اس آلہ کے بارے میں تاثرات بھیجیں"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"‏منتظم PIN درج کریں"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"آن"</string>
@@ -3728,7 +3724,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"اپنے نئے ٹیبلیٹ کا ایک ٹؤر لیں"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"اپنے نئے آلے کا ایک ٹؤر لیں"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"یہ خصوصیت اس آلہ میں دستیاب نہیں ہے"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"‏IMS رجسٹریشن کی صورتحال"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"رجسٹر شدہ"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"رجسٹر نہیں ہے"</string>
 </resources>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 3b104fa..5fd3c0c 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi‑Fi MAC-manzili"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth manzili"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Seriya raqami"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Mavjud emas"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Faollik vaqti"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Uyg‘oqlik vaqti"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Ichki xotira"</string>
@@ -2361,8 +2360,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Qo‘lbola sinxronlanmadi"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Ushbu narsani sinxronlash hozir o‘chirilgan. Bu sozlamani o‘zgartirish uchun vaqtincha fonda trafik yuklashni yoqib, keyin avtomatik sinx-lashga o‘ting."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G tarmog‘i"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC manzili"</string>
     <string name="enter_password" msgid="8035706727471334122">"Androidni ishga tushirish uchun parolni kiriting"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Androidni ishga tushirish uchun PIN kodni kiriting"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Androidni ishga tushirish uchun chizmali parolni chizing"</string>
@@ -3067,8 +3064,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Agar ekran o‘chiq bo‘lsa"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Agar ekran yoniq yoki o‘chiq bo‘lsa"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Bildirishnoma sozlamalari"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"OK"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Qurilma haqida fikr-mulohaza"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Administrator PIN kodini kiriting"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"YONIQ"</string>
@@ -3320,8 +3316,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Tizim sozlamalarini o‘zgartirishi mumkin"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Tizim sozlamalarini o‘zgartirish"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"Tizim sozlamalarini o‘zgartirish uchun ruxsat"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"Tizim sozlamalarini o‘zgartirishga ruxsat"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Bu ruxsatnoma ilovaga tizim sozlamalarini o‘zgaritish uchun ruxsat beradi."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Ha"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Yo‘q"</string>
@@ -3742,7 +3737,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Yangi planshetingiz bilan tanishib chiqing"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Yangi qurilmangiz bilan tanishib chiqing"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Bu funksiya ushbu qurilmada ishlamaydi"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"IMS registratsiyasi holati"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"Registratsiya qilingan"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Registratsiya qilinmagan"</string>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 7cfe93f..40fea8b 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Địa chỉ MAC của Wi‑Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Địa chỉ Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Số sê-ri"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Không có"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Thời gian hoạt động"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Thời gian thức"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Bộ nhớ trong"</string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Không thể đồng bộ hóa theo cách thủ công"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Đồng bộ hóa cho mục này hiện đã bị vô hiệu hóa. Để thay đổi cài đặt này, hãy tạm thời bật dữ liệu nền và đồng bộ hóa tự động."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"Địa chỉ MAC 4G"</string>
     <string name="enter_password" msgid="8035706727471334122">"Để bắt đầu sử dụng thiết bị Android, hãy nhập mật khẩu của bạn"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Để bắt đầu sử dụng thiết bị Android, hãy nhập mã PIN của bạn"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Để bắt đầu sử dụng thiết bị Android, hãy vẽ hình mẫu của bạn"</string>
@@ -3055,8 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Khi màn hình đang tắt"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Khi màn hình đang bật hoặc tắt"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Cài đặt thông báo"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"Ok"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Gửi phản hồi về thiết bị này"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Nhập mã PIN quản trị"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Bật"</string>
@@ -3730,7 +3726,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Tham quan máy tính bảng mới của bạn"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Tham quan thiết bị mới của bạn"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Không sử dụng được tính năng này trên thiết bị này"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"Trạng thái đăng ký IMS"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"Đã đăng ký"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Chưa được đăng ký"</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 0b22ac3..ed9b073 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"WLAN MAC 地址"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"蓝牙地址"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"序列号"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"无法获取"</string>
     <string name="status_up_time" msgid="7294859476816760399">"已开机时间"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"唤醒时间"</string>
     <string name="internal_memory" msgid="9129595691484260784">"内部存储空间"</string>
@@ -2349,8 +2348,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"无法手动同步"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"此项内容的同步功能目前未开启。要更改此设置，请暂时开启后台流量和自动同步功能。"</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC地址"</string>
     <string name="enter_password" msgid="8035706727471334122">"要启动Android，请输入您的密码"</string>
     <string name="enter_pin" msgid="5305333588093263790">"要启动Android，请输入您的PIN码"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"要启动Android，请绘制您的解锁图案"</string>
@@ -3055,8 +3052,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"屏幕关闭时"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"屏幕开启或关闭时"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"通知设置"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"确定"</string>
     <string name="device_feedback" msgid="3238056036766293294">"发送有关此设备的反馈"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"输入管理员 PIN 码"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"开启"</string>
@@ -3730,7 +3726,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"新平板电脑功能导览"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"新设备功能导览"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"该设备不支持此功能"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"IMS 注册状态"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"已注册"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"未注册"</string>
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 30862de..33575fc 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi-Fi MAC 位址"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"藍牙位址"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"序號"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"無法使用"</string>
     <string name="status_up_time" msgid="7294859476816760399">"開機時間"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"啟用時間"</string>
     <string name="internal_memory" msgid="9129595691484260784">"內部儲存空間"</string>
@@ -2352,8 +2351,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"無法手動同步處理"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"這個項目的同步處理功能已停用。如要更改此設定，請暫時開啟背景資料與自動同步處理功能。"</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC 位址"</string>
     <string name="enter_password" msgid="8035706727471334122">"如要啟動 Android，請輸入密碼"</string>
     <string name="enter_pin" msgid="5305333588093263790">"如要啟動 Android，請輸入您的 PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"如要啟動 Android，請畫出解鎖圖案"</string>
@@ -2763,7 +2760,7 @@
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"短訊, 發短訊, 訊息, 傳送短訊"</string>
     <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"流動網絡, 流動裝置, 流動網絡供應商, 無線, 數據, 4G, 3G, 2G, LTE"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"WiFi, Wi-Fi, 通話, 撥號中"</string>
-    <string name="keywords_home" msgid="3626170808219458848">"應用程式啟動器"</string>
+    <string name="keywords_home" msgid="3626170808219458848">"啟動器"</string>
     <string name="keywords_display" msgid="8910345814565493016">"螢幕, 觸控螢幕"</string>
     <string name="keywords_display_brightness_level" msgid="3891383826236015854">"螢幕變暗, 觸控螢幕, 電池"</string>
     <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"螢幕變暗, 觸控螢幕, 電池"</string>
@@ -3058,8 +3055,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"螢幕關閉時"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"螢幕開啟或關閉時"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"通知設定"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"確定"</string>
     <string name="device_feedback" msgid="3238056036766293294">"傳送您對這部裝置的意見"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"輸入管理員 PIN 碼"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"開啟"</string>
@@ -3253,7 +3249,7 @@
     <string name="assist_access_screenshot_summary" msgid="6761636689013259901">"允許小幫手應用程式存取螢幕上的圖片"</string>
     <string name="assist_flash_title" msgid="506661221230034891">"閃動畫面"</string>
     <string name="assist_flash_summary" msgid="9160668468824099262">"輔助應用程式存取畫面上的文字或擷取螢幕畫面時，畫面邊沿會閃動"</string>
-    <string name="assist_footer" msgid="1982791172085896864">"小幫手應用程式能根據您正在查看的螢幕資訊提供協助，部分應用程式可同時支援應用程式啟動器及語音輸入服務，提供更全面的協助。"</string>
+    <string name="assist_footer" msgid="1982791172085896864">"小幫手應用程式能根據您正在查看的螢幕資訊提供協助，部分應用程式可同時支援啟動器及語音輸入服務，提供更全面的協助。"</string>
     <string name="average_memory_use" msgid="829566450150198512">"平均記憶體用量"</string>
     <string name="maximum_memory_use" msgid="7493720799710132496">"最高記憶體用量"</string>
     <string name="memory_usage" msgid="1781358557214390033">"記憶體用量"</string>
@@ -3733,7 +3729,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"探索您的新平板電腦"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"探索您的新裝置"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"這部裝置不支援此功能"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"IMS 註冊狀態"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"已註冊"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"未註冊"</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 786bfd3..201fb3a 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi-Fi MAC 位址"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"藍牙位址"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"序號"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"無法取得"</string>
     <string name="status_up_time" msgid="7294859476816760399">"開機累計時間"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"清醒時間"</string>
     <string name="internal_memory" msgid="9129595691484260784">"內部儲存空間"</string>
@@ -2353,8 +2352,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"無法手動同步處理"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"這個項目的同步處理功能已停用。如要變更這項設定，請暫時開啟背景資料與自動同步處理功能。"</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC 位址"</string>
     <string name="enter_password" msgid="8035706727471334122">"如要啟動 Android，請輸入你的密碼"</string>
     <string name="enter_pin" msgid="5305333588093263790">"如要啟動 Android，請輸入你的 PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"如要啟動 Android，請畫出解鎖圖案"</string>
@@ -3059,8 +3056,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"螢幕關閉時"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"螢幕開啟或關閉時"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"通知設定"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"確定"</string>
     <string name="device_feedback" msgid="3238056036766293294">"傳送你對這個裝置的意見回饋"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"輸入管理員 PIN 碼"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"開啟"</string>
@@ -3734,7 +3730,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"認識你的新平板電腦"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"認識你的新裝置"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"這個裝置不支援此功能"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"IMS 註冊狀態"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"已註冊"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"未註冊"</string>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 9345904..473dfcf 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -1159,7 +1159,6 @@
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"Ikheli le-Wi-Fi MAC"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Ikheli le-Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Inombolo yomkhiqizo"</string>
-    <string name="status_unavailable" msgid="7862009036663793314">"Ayitholakali"</string>
     <string name="status_up_time" msgid="7294859476816760399">"Isikhathi esiphezulu"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Isikhathi sokuphaphama"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Isitoreji sangaphakathi"</string>
@@ -2350,8 +2349,6 @@
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Ayikwazi ukuvumelanisa ngesandla"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Ukuvumelanisa kwalentwana kuvimbelwe okwamanje. Ukushintsha okukhethwayo kwakho, vula idatha yasemuva nokuvumelanisa okuzenzakalelayo."</string>
-    <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"Ikheli le-4G MAC"</string>
     <string name="enter_password" msgid="8035706727471334122">"Ukuze uqale i-Android, faka iphasiwedi yakho"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Ukuze uqale i-Android, faka iphinikhodi yakho"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Ukuze uqale i-Android, dweba iphethini yakho"</string>
@@ -3056,8 +3053,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Uma isikrini sivaliwe"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Uma isikrini sivuliwe noma sivaliwe"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Izilungiselelo zesaziso"</string>
-    <!-- no translation found for suggestion_button_text (3275010948381252006) -->
-    <skip />
+    <string name="suggestion_button_text" msgid="3275010948381252006">"Kulungile"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Thumela impendulo mayelana nale divayisi"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Faka iphinikhodi yomlawuli"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Vuliwe"</string>
@@ -3309,8 +3305,7 @@
     <string name="write_settings_title" msgid="4232152481902542284">"Ingashintsha izilungiselelo zesistimu"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"Shintsha izilungiselelo zesistimu"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"Imvume yezilungiselelo zesistimu zokushintsha zohlelo lokusebenza"</string>
-    <!-- no translation found for permit_write_settings (658555006453212691) -->
-    <skip />
+    <string name="permit_write_settings" msgid="658555006453212691">"Vumela izilungiselelo zesistimu yokushintsha"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Le mvume ivumela uhlelo lokusebenza ukushintsha izilungiselelo zesistimu."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Yebo"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Cha"</string>
@@ -3731,7 +3726,4 @@
     <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Thatha uhambo kuthebulethi yakho entsha"</string>
     <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Thatha uhambo lwedivayisi yakho entsha"</string>
     <string name="disabled_low_ram_device" msgid="3751578499721173344">"Lesi sici asitholakali kule divayisi"</string>
-    <string name="ims_reg_title" msgid="7609782759207241443">"Isimo sokubhaliswa se-IMS"</string>
-    <string name="ims_reg_status_registered" msgid="933003316932739188">"Kubhalisiwe"</string>
-    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Akubhalisiwe"</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 42e553d..6a6c2a7 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -6476,6 +6476,9 @@
         <item quantity="other">Show %d hidden items</item>
     </plurals>
 
+    <!-- Content description for suggestion footer button. Double tapping will cause suggestion list to collapse [CHAR LIMIT=NONE]-->
+    <string name="dashboard_suggestion_condition_footer_content_description">Collapse</string>
+
     <!-- Title for setting tile leading to network and Internet settings [CHAR LIMIT=40]-->
     <string name="network_dashboard_title">Network &amp; Internet</string>
     <!-- Summary for Network and Internet settings, explaining it contains mobile network setting [CHAR LIMIT=NONE]-->
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index a49cfff..1da2a25 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -97,11 +97,8 @@
 
     <Preference
         android:key="quick_settings_tiles"
-        android:title="@string/quick_settings_developer_tiles">
-        <intent
-            android:targetPackage="com.android.settings"
-            android:targetClass="com.android.settings.qstile.DevelopmentTileConfigActivity" />
-    </Preference>
+        android:title="@string/quick_settings_developer_tiles"
+        android:fragment="com.android.settings.development.qstile.DevelopmentTileConfigFragment" />
 
     <PreferenceCategory android:key="debug_debugging_category"
             android:title="@string/debug_debugging_category">
diff --git a/src/com/android/settings/dashboard/DashboardAdapter.java b/src/com/android/settings/dashboard/DashboardAdapter.java
index d4397dc..b28ff24 100644
--- a/src/com/android/settings/dashboard/DashboardAdapter.java
+++ b/src/com/android/settings/dashboard/DashboardAdapter.java
@@ -48,7 +48,6 @@
 import com.android.settings.dashboard.suggestions.SuggestionAdapter;
 import com.android.settings.dashboard.suggestions.SuggestionControllerMixin;
 import com.android.settings.dashboard.suggestions.SuggestionDismissController;
-import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.Utils;
 import com.android.settingslib.drawer.DashboardCategory;
@@ -78,7 +77,6 @@
     private final SuggestionControllerMixin mSuggestionControllerMixin;
     private final MetricsFeatureProvider mMetricsFeatureProvider;
     private final DashboardFeatureProvider mDashboardFeatureProvider;
-    private final SuggestionFeatureProvider mSuggestionFeatureProvider;
     private final ArrayList<String> mSuggestionsShownLogged;
     private boolean mFirstFrameDrawn;
     private RecyclerView mRecyclerView;
@@ -114,7 +112,6 @@
         mSuggestionControllerMixin = suggestionControllerMixin;
         mMetricsFeatureProvider = factory.getMetricsFeatureProvider();
         mDashboardFeatureProvider = factory.getDashboardFeatureProvider(context);
-        mSuggestionFeatureProvider = factory.getSuggestionFeatureProvider(context);
         mCache = new IconCache(context);
         mSuggestionParser = suggestionParser;
         mCallback = callback;
@@ -341,11 +338,12 @@
     void onBindSuggestionConditionHeader(final SuggestionAndConditionHeaderHolder holder,
             SuggestionConditionHeaderData data) {
         final int curMode = mDashboardData.getSuggestionConditionMode();
-        final int nextMode = data.hiddenSuggestionCount > 0 && data.conditionCount > 0
+        final int nextMode = data.hiddenSuggestionCount > 0
+                && data.conditionCount > 0
                 && curMode != DashboardData.HEADER_MODE_SUGGESTION_EXPANDED
                 ? DashboardData.HEADER_MODE_SUGGESTION_EXPANDED
                 : DashboardData.HEADER_MODE_FULLY_EXPANDED;
-        final boolean moreSuggestions = data.hiddenSuggestionCount > 0;
+
         final boolean hasConditions = data.conditionCount > 0;
         if (data.conditionCount > 0) {
             holder.icon.setImageIcon(data.conditionIcons.get(0));
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java b/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java
index 8502fa7..a9d0546 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java
@@ -157,8 +157,6 @@
         final View primaryAction = holder.itemView.findViewById(android.R.id.primary);
         if (primaryAction != null) {
             clickHandler = primaryAction;
-            // set the item view to disabled to remove any touch effects
-            holder.itemView.setEnabled(false);
         }
 
         clickHandler.setOnClickListener(v -> {
diff --git a/src/com/android/settings/development/AnimatorDurationScalePreferenceController.java b/src/com/android/settings/development/AnimatorDurationScalePreferenceController.java
new file mode 100644
index 0000000..4d8d4ee
--- /dev/null
+++ b/src/com/android/settings/development/AnimatorDurationScalePreferenceController.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import android.content.Context;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.view.IWindowManager;
+
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class AnimatorDurationScalePreferenceController extends
+        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+        PreferenceControllerMixin {
+
+    private static final String ANIMATOR_DURATION_SCALE_KEY = "animator_duration_scale";
+
+    @VisibleForTesting
+    static final int ANIMATOR_DURATION_SCALE_SELECTOR = 2;
+    @VisibleForTesting
+    static final float DEFAULT_VALUE = 1;
+
+    private final IWindowManager mWindowManager;
+    private final String[] mListValues;
+    private final String[] mListSummaries;
+
+    private ListPreference mPreference;
+
+    public AnimatorDurationScalePreferenceController(Context context) {
+        super(context);
+
+        mWindowManager = IWindowManager.Stub.asInterface(
+                ServiceManager.getService(Context.WINDOW_SERVICE));
+        mListValues = context.getResources().getStringArray(R.array.animator_duration_scale_values);
+        mListSummaries = context.getResources().getStringArray(
+                R.array.animator_duration_scale_entries);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return ANIMATOR_DURATION_SCALE_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (ListPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        writeAnimationScaleOption(newValue);
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        updateAnimationScaleValue();
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        writeAnimationScaleOption(null);
+        mPreference.setEnabled(false);
+    }
+
+    private void writeAnimationScaleOption(Object newValue) {
+        try {
+            float scale = newValue != null ? Float.parseFloat(newValue.toString()) : DEFAULT_VALUE;
+            mWindowManager.setAnimationScale(ANIMATOR_DURATION_SCALE_SELECTOR, scale);
+            updateAnimationScaleValue();
+        } catch (RemoteException e) {
+            // intentional no-op
+        }
+    }
+
+    private void updateAnimationScaleValue() {
+        try {
+            final float scale = mWindowManager.getAnimationScale(ANIMATOR_DURATION_SCALE_SELECTOR);
+            int index = 0; // default
+            for (int i = 0; i < mListValues.length; i++) {
+                float val = Float.parseFloat(mListValues[i]);
+                if (scale <= val) {
+                    index = i;
+                    break;
+                }
+            }
+            mPreference.setValue(mListValues[index]);
+            mPreference.setSummary(mListSummaries[index]);
+        } catch (RemoteException e) {
+            // intentional no-op
+        }
+    }
+}
diff --git a/src/com/android/settings/development/BluetoothA2dpSharedStore.java b/src/com/android/settings/development/BluetoothA2dpSharedStore.java
new file mode 100644
index 0000000..bb7cb2e
--- /dev/null
+++ b/src/com/android/settings/development/BluetoothA2dpSharedStore.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import android.bluetooth.BluetoothCodecConfig;
+
+/**
+ * Utility class for storing current Bluetooth A2DP profile values
+ */
+public class BluetoothA2dpSharedStore {
+
+    // init default values
+    private static int sCodecType = BluetoothCodecConfig.SOURCE_CODEC_TYPE_INVALID;
+    private static int sCodecPriority = BluetoothCodecConfig.CODEC_PRIORITY_DEFAULT;
+    private static int sSampleRate = BluetoothCodecConfig.SAMPLE_RATE_NONE;
+    private static int sBitsPerSample = BluetoothCodecConfig.BITS_PER_SAMPLE_NONE;
+    private static int sChannelMode = BluetoothCodecConfig.CHANNEL_MODE_NONE;
+    private static long sCodecSpecific1Value = 0;
+    private static long sCodecSpecific2Value = 0;
+    private static long sCodecSpecific3Value = 0;
+    private static long sCodecSpecific4Value = 0;
+
+    public static int getCodecType() {
+        return sCodecType;
+    }
+
+    public static int getCodecPriority() {
+        return sCodecPriority;
+    }
+
+    public static int getSampleRate() {
+        return sSampleRate;
+    }
+
+    public static int getBitsPerSample() {
+        return sBitsPerSample;
+    }
+
+    public static int getChannelMode() {
+        return sChannelMode;
+    }
+
+    public static long getCodecSpecific1Value() {
+        return sCodecSpecific1Value;
+    }
+
+    public static long getCodecSpecific2Value() {
+        return sCodecSpecific2Value;
+    }
+
+    public static long getCodecSpecific3Value() {
+        return sCodecSpecific3Value;
+    }
+
+    public static long getCodecSpecific4Value() {
+        return sCodecSpecific4Value;
+    }
+
+    public static void setCodecType(int codecType) {
+        sCodecType = codecType;
+    }
+
+    public static void setCodecPriority(int codecPriority) {
+        sCodecPriority = codecPriority;
+    }
+
+    public static void setSampleRate(int sampleRate) {
+        sSampleRate = sampleRate;
+    }
+
+    public static void setBitsPerSample(int bitsPerSample) {
+        sBitsPerSample = bitsPerSample;
+    }
+
+    public static void setChannelMode(int channelMode) {
+        sChannelMode = channelMode;
+    }
+
+    public static void setCodecSpecific1Value(int codecSpecific1Value) {
+        sCodecSpecific1Value = codecSpecific1Value;
+    }
+
+    public static void setCodecSpecific2Value(int codecSpecific2Value) {
+        sCodecSpecific2Value = codecSpecific2Value;
+    }
+
+    public static void setCodecSpecific3Value(int codecSpecific3Value) {
+        sCodecSpecific3Value = codecSpecific3Value;
+    }
+
+    public static void setCodecSpecific4Value(int codecSpecific4Value) {
+        sCodecSpecific4Value = codecSpecific4Value;
+    }
+}
diff --git a/src/com/android/settings/development/BluetoothAudioSampleRatePreferenceController.java b/src/com/android/settings/development/BluetoothAudioSampleRatePreferenceController.java
new file mode 100644
index 0000000..43acaa5
--- /dev/null
+++ b/src/com/android/settings/development/BluetoothAudioSampleRatePreferenceController.java
@@ -0,0 +1,243 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import android.bluetooth.BluetoothA2dp;
+import android.bluetooth.BluetoothCodecConfig;
+import android.content.Context;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnDestroy;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class BluetoothAudioSampleRatePreferenceController extends
+        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+        PreferenceControllerMixin, BluetoothServiceConnectionListener, LifecycleObserver,
+        OnDestroy {
+
+    private static final String BLUETOOTH_SELECT_A2DP_SAMPLE_RATE_KEY =
+            "bluetooth_select_a2dp_sample_rate";
+
+    @VisibleForTesting
+    static final int STREAMING_LABEL_ID = R.string.bluetooth_select_a2dp_codec_streaming_label;
+
+    private final String[] mListValues;
+    private final String[] mListSummaries;
+    private final Object mBluetoothA2dpLock;
+    private ListPreference mPreference;
+    private BluetoothA2dp mBluetoothA2dp;
+
+    public BluetoothAudioSampleRatePreferenceController(Context context, Lifecycle lifecycle,
+            Object bluetoothA2dpLock) {
+        super(context);
+
+        mBluetoothA2dpLock = bluetoothA2dpLock;
+        mListValues = context.getResources().getStringArray(
+                R.array.bluetooth_a2dp_codec_sample_rate_values);
+        mListSummaries = context.getResources().getStringArray(
+                R.array.bluetooth_a2dp_codec_sample_rate_summaries);
+
+        if (lifecycle != null) {
+            lifecycle.addObserver(this);
+        }
+    }
+
+
+    @Override
+    public String getPreferenceKey() {
+        return BLUETOOTH_SELECT_A2DP_SAMPLE_RATE_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (ListPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        if (mBluetoothA2dp == null) {
+            return false;
+        }
+
+        final int sampleRate = mapPreferenceValueToSampleRate(newValue.toString());
+        BluetoothA2dpSharedStore.setSampleRate(sampleRate);
+
+        final int codecTypeValue = BluetoothA2dpSharedStore.getCodecType();
+        final int codecPriorityValue = BluetoothA2dpSharedStore.getCodecPriority();
+        final int sampleRateValue = BluetoothA2dpSharedStore.getSampleRate();
+        final int bitsPerSampleValue = BluetoothA2dpSharedStore.getBitsPerSample();
+        final int channelModeValue = BluetoothA2dpSharedStore.getChannelMode();
+        final long codecSpecific1Value = BluetoothA2dpSharedStore.getCodecSpecific1Value();
+        final long codecSpecific2Value = BluetoothA2dpSharedStore.getCodecSpecific2Value();
+        final long codecSpecific3Value = BluetoothA2dpSharedStore.getCodecSpecific3Value();
+        final long codecSpecific4Value = BluetoothA2dpSharedStore.getCodecSpecific4Value();
+
+        // get values from shared store
+        BluetoothCodecConfig codecConfig = createCodecConfig(codecTypeValue, codecPriorityValue,
+                sampleRateValue, bitsPerSampleValue,
+                channelModeValue, codecSpecific1Value,
+                codecSpecific2Value, codecSpecific3Value,
+                codecSpecific4Value);
+
+        synchronized (mBluetoothA2dpLock) {
+            if (mBluetoothA2dp != null) {
+                setCodecConfigPreference(codecConfig);
+            }
+        }
+        updateState(mPreference);
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        if (getCodecConfig() == null || mPreference == null) {
+            return;
+        }
+
+        BluetoothCodecConfig codecConfig;
+        synchronized (mBluetoothA2dpLock) {
+            codecConfig = getCodecConfig();
+        }
+        final int sampleRate = codecConfig.getSampleRate();
+        final int index = mapSampleRateToIndex(sampleRate);
+
+        mPreference.setValue(mListValues[index]);
+        mPreference.setSummary(
+                mContext.getResources().getString(STREAMING_LABEL_ID, mListSummaries[index]));
+
+        // write value to shared store
+        BluetoothA2dpSharedStore.setSampleRate(sampleRate);
+    }
+
+    @Override
+    public void onBluetoothServiceConnected(BluetoothA2dp bluetoothA2dp) {
+        mBluetoothA2dp = bluetoothA2dp;
+        updateState(mPreference);
+    }
+
+    @Override
+    public void onBluetoothCodecUpdated() {
+        updateState(mPreference);
+    }
+
+    @Override
+    public void onBluetoothServiceDisconnected() {
+        mBluetoothA2dp = null;
+    }
+
+    @Override
+    public void onDestroy() {
+        mBluetoothA2dp = null;
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        mPreference.setEnabled(false);
+    }
+
+    private int mapSampleRateToIndex(int sampleRate) {
+        int index = 0;
+        switch (sampleRate) {
+            case BluetoothCodecConfig.SAMPLE_RATE_44100:
+                index = 1;
+                break;
+            case BluetoothCodecConfig.SAMPLE_RATE_48000:
+                index = 2;
+                break;
+            case BluetoothCodecConfig.SAMPLE_RATE_88200:
+                index = 3;
+                break;
+            case BluetoothCodecConfig.SAMPLE_RATE_96000:
+                index = 4;
+                break;
+            case BluetoothCodecConfig.SAMPLE_RATE_176400:
+            case BluetoothCodecConfig.SAMPLE_RATE_192000:
+            case BluetoothCodecConfig.SAMPLE_RATE_NONE:
+            default:
+                break;
+        }
+        return index;
+    }
+
+    private int mapPreferenceValueToSampleRate(String value) {
+        final int index = mPreference.findIndexOfValue(value);
+        int sampleRateValue = 0;
+        switch (index) {
+            case 0:
+                // Reset to default
+                sampleRateValue = BluetoothCodecConfig.SAMPLE_RATE_NONE;
+                break;
+            case 1:
+                sampleRateValue = BluetoothCodecConfig.SAMPLE_RATE_44100;
+                break;
+            case 2:
+                sampleRateValue = BluetoothCodecConfig.SAMPLE_RATE_48000;
+                break;
+            case 3:
+                sampleRateValue = BluetoothCodecConfig.SAMPLE_RATE_88200;
+                break;
+            case 4:
+                sampleRateValue = BluetoothCodecConfig.SAMPLE_RATE_96000;
+                break;
+            default:
+                break;
+        }
+        return sampleRateValue;
+    }
+
+    @VisibleForTesting
+    void setCodecConfigPreference(BluetoothCodecConfig config) {
+        mBluetoothA2dp.setCodecConfigPreference(config);
+    }
+
+    @VisibleForTesting
+    BluetoothCodecConfig getCodecConfig() {
+        if (mBluetoothA2dp == null || mBluetoothA2dp.getCodecStatus() == null) {
+            return null;
+        }
+
+        return mBluetoothA2dp.getCodecStatus().getCodecConfig();
+    }
+
+    @VisibleForTesting
+    BluetoothCodecConfig createCodecConfig(int codecTypeValue, int codecPriorityValue,
+            int sampleRateValue, int bitsPerSampleValue,
+            int channelModeValue, long codecSpecific1Value,
+            long codecSpecific2Value, long codecSpecific3Value,
+            long codecSpecific4Value) {
+        return new BluetoothCodecConfig(codecTypeValue, codecPriorityValue,
+                sampleRateValue, bitsPerSampleValue,
+                channelModeValue, codecSpecific1Value,
+                codecSpecific2Value, codecSpecific3Value,
+                codecSpecific4Value);
+    }
+
+}
diff --git a/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceController.java b/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceController.java
new file mode 100644
index 0000000..a56f5ea
--- /dev/null
+++ b/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceController.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.TextUtils;
+
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class BluetoothAvrcpVersionPreferenceController extends
+        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+        PreferenceControllerMixin {
+
+    private static final String BLUETOOTH_SELECT_AVRCP_VERSION_KEY =
+            "bluetooth_select_avrcp_version";
+
+    @VisibleForTesting
+    static final String BLUETOOTH_AVRCP_VERSION_PROPERTY = "persist.bluetooth.avrcpversion";
+
+    private final String[] mListValues;
+    private final String[] mListSummaries;
+    private ListPreference mPreference;
+
+    public BluetoothAvrcpVersionPreferenceController(Context context) {
+        super(context);
+
+        mListValues = context.getResources().getStringArray(R.array.bluetooth_avrcp_version_values);
+        mListSummaries = context.getResources().getStringArray(R.array.bluetooth_avrcp_versions);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return BLUETOOTH_SELECT_AVRCP_VERSION_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (ListPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        SystemProperties.set(BLUETOOTH_AVRCP_VERSION_PROPERTY, newValue.toString());
+        updateState(mPreference);
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        final String currentValue = SystemProperties.get(BLUETOOTH_AVRCP_VERSION_PROPERTY);
+        int index = 0; // Defaults to AVRCP 1.4
+        for (int i = 0; i < mListValues.length; i++) {
+            if (TextUtils.equals(currentValue, mListValues[i])) {
+                index = i;
+                break;
+            }
+        }
+        mPreference.setValue(mListValues[index]);
+        mPreference.setSummary(mListSummaries[index]);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        mPreference.setEnabled(false);
+    }
+}
diff --git a/src/com/android/settings/development/BluetoothServiceConnectionListener.java b/src/com/android/settings/development/BluetoothServiceConnectionListener.java
new file mode 100644
index 0000000..9dcd3b7
--- /dev/null
+++ b/src/com/android/settings/development/BluetoothServiceConnectionListener.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import android.bluetooth.BluetoothA2dp;
+
+/**
+ * Interface for callbacks about bluetooth connectivity.
+ */
+public interface BluetoothServiceConnectionListener {
+
+    /**
+     * Called when the bluetooth service is connected.
+     * @param bluetoothA2dp controller for Bluetooth A2DP profile.
+     */
+    void onBluetoothServiceConnected(BluetoothA2dp bluetoothA2dp);
+
+    /**
+     * Called when the bluetooth codec configuration is changed.
+     */
+    void onBluetoothCodecUpdated();
+
+    /**
+     * Called with the bluetooth service is disconnected.
+     */
+    void onBluetoothServiceDisconnected();
+}
diff --git a/src/com/android/settings/development/DebugGpuOverdrawPreferenceController.java b/src/com/android/settings/development/DebugGpuOverdrawPreferenceController.java
new file mode 100644
index 0000000..5e0baa8
--- /dev/null
+++ b/src/com/android/settings/development/DebugGpuOverdrawPreferenceController.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.TextUtils;
+import android.view.ThreadedRenderer;
+
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+import com.android.settingslib.development.SystemPropPoker;
+
+public class DebugGpuOverdrawPreferenceController extends
+        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+        PreferenceControllerMixin {
+
+    private static final String DEBUG_HW_OVERDRAW_KEY = "debug_hw_overdraw";
+
+    private final String[] mListValues;
+    private final String[] mListSummaries;
+    private ListPreference mPreference;
+
+    public DebugGpuOverdrawPreferenceController(Context context) {
+        super(context);
+
+        mListValues = context.getResources().getStringArray(R.array.debug_hw_overdraw_values);
+        mListSummaries = context.getResources().getStringArray(R.array.debug_hw_overdraw_entries);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return DEBUG_HW_OVERDRAW_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (ListPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        writeDebugHwOverdrawOptions(newValue);
+        updateDebugHwOverdrawOptions();
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        updateDebugHwOverdrawOptions();
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        mPreference.setEnabled(false);
+    }
+
+    private void writeDebugHwOverdrawOptions(Object newValue) {
+        SystemProperties.set(ThreadedRenderer.DEBUG_OVERDRAW_PROPERTY,
+                newValue == null ? "" : newValue.toString());
+        SystemPropPoker.getInstance().poke();
+    }
+
+    private void updateDebugHwOverdrawOptions() {
+        final String value = SystemProperties.get(
+                ThreadedRenderer.DEBUG_OVERDRAW_PROPERTY, "" /* default */);
+
+        int index = 0; // default
+        for (int i = 0; i < mListValues.length; i++) {
+            if (TextUtils.equals(value, mListValues[i])) {
+                index = i;
+                break;
+            }
+        }
+        mPreference.setValue(mListValues[index]);
+        mPreference.setSummary(mListSummaries[index]);
+    }
+}
diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
index 39e3d03..8c56ebb 100644
--- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
+++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
@@ -17,6 +17,10 @@
 package com.android.settings.development;
 
 import android.app.Activity;
+import android.bluetooth.BluetoothA2dp;
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothCodecStatus;
+import android.bluetooth.BluetoothProfile;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -52,14 +56,17 @@
 
 public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFragment
         implements SwitchBar.OnSwitchChangeListener, OemUnlockDialogHost, AdbDialogHost,
-        AdbClearKeysDialogHost {
+        AdbClearKeysDialogHost, LogPersistDialogHost {
 
     private static final String TAG = "DevSettingsDashboard";
 
+    private final Object mBluetoothA2dpLock = new Object();
+
     private boolean mIsAvailable = true;
     private SwitchBar mSwitchBar;
     private DevelopmentSwitchBarController mSwitchBarController;
     private List<AbstractPreferenceController> mPreferenceControllers = new ArrayList<>();
+    private BluetoothA2dp mBluetoothA2dp;
 
     private final BroadcastReceiver mEnableAdbReceiver = new BroadcastReceiver() {
         @Override
@@ -72,6 +79,56 @@
         }
     };
 
+    private final BroadcastReceiver mBluetoothA2dpReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            Log.d(TAG, "mBluetoothA2dpReceiver.onReceive intent=" + intent);
+            String action = intent.getAction();
+
+            if (BluetoothA2dp.ACTION_CODEC_CONFIG_CHANGED.equals(action)) {
+                BluetoothCodecStatus codecStatus = intent.getParcelableExtra(
+                        BluetoothCodecStatus.EXTRA_CODEC_STATUS);
+                Log.d(TAG, "Received BluetoothCodecStatus=" + codecStatus);
+                for (AbstractPreferenceController controller : mPreferenceControllers) {
+                    if (controller instanceof BluetoothServiceConnectionListener) {
+                        ((BluetoothServiceConnectionListener) controller).onBluetoothCodecUpdated();
+                    }
+                }
+            }
+        }
+    };
+
+
+    private final BluetoothProfile.ServiceListener mBluetoothA2dpServiceListener =
+            new BluetoothProfile.ServiceListener() {
+                @Override
+                public void onServiceConnected(int profile,
+                        BluetoothProfile proxy) {
+                    synchronized (mBluetoothA2dpLock) {
+                        mBluetoothA2dp = (BluetoothA2dp) proxy;
+                    }
+                    for (AbstractPreferenceController controller : mPreferenceControllers) {
+                        if (controller instanceof BluetoothServiceConnectionListener) {
+                            ((BluetoothServiceConnectionListener) controller)
+                                    .onBluetoothServiceConnected(mBluetoothA2dp);
+                        }
+                    }
+                }
+
+                @Override
+                public void onServiceDisconnected(int profile) {
+                    synchronized (mBluetoothA2dpLock) {
+                        mBluetoothA2dp = null;
+                    }
+                    for (AbstractPreferenceController controller : mPreferenceControllers) {
+                        if (controller instanceof BluetoothServiceConnectionListener) {
+                            ((BluetoothServiceConnectionListener) controller)
+                                    .onBluetoothServiceDisconnected();
+                        }
+                    }
+                }
+            };
+
     public DevelopmentSettingsDashboardFragment() {
         super(UserManager.DISALLOW_DEBUGGING_FEATURES);
     }
@@ -103,6 +160,12 @@
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
         registerReceivers();
+
+        final BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
+        if (adapter != null) {
+            adapter.getProfileProxy(getActivity(), mBluetoothA2dpServiceListener,
+                    BluetoothProfile.A2DP);
+        }
         return super.onCreateView(inflater, container, savedInstanceState);
     }
 
@@ -110,6 +173,12 @@
     public void onDestroyView() {
         super.onDestroyView();
         unregisterReceivers();
+
+        final BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
+        if (adapter != null) {
+            adapter.closeProfileProxy(BluetoothProfile.A2DP, mBluetoothA2dp);
+            mBluetoothA2dp = null;
+        }
     }
 
     @Override
@@ -180,6 +249,20 @@
     }
 
     @Override
+    public void onDisableLogPersistDialogConfirmed() {
+        final LogPersistPreferenceControllerV2 controller = getDevelopmentOptionsController(
+                LogPersistPreferenceControllerV2.class);
+        controller.onDisableLogPersistDialogConfirmed();
+    }
+
+    @Override
+    public void onDisableLogPersistDialogRejected() {
+        final LogPersistPreferenceControllerV2 controller = getDevelopmentOptionsController(
+                LogPersistPreferenceControllerV2.class);
+        controller.onDisableLogPersistDialogRejected();
+    }
+
+    @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         boolean handledResult = false;
         for (AbstractPreferenceController controller : mPreferenceControllers) {
@@ -215,7 +298,7 @@
     @Override
     protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
         mPreferenceControllers = buildPreferenceControllers(context, getActivity(), getLifecycle(),
-                this /* devOptionsDashboardFragment */);
+                this /* devOptionsDashboardFragment */, mBluetoothA2dpLock);
         return mPreferenceControllers;
     }
 
@@ -223,10 +306,15 @@
         LocalBroadcastManager.getInstance(getContext())
                 .registerReceiver(mEnableAdbReceiver, new IntentFilter(
                         AdbPreferenceController.ACTION_ENABLE_ADB_STATE_CHANGED));
+
+        final IntentFilter filter = new IntentFilter();
+        filter.addAction(BluetoothA2dp.ACTION_CODEC_CONFIG_CHANGED);
+        getActivity().registerReceiver(mBluetoothA2dpReceiver, filter);
     }
 
     private void unregisterReceivers() {
         LocalBroadcastManager.getInstance(getContext()).unregisterReceiver(mEnableAdbReceiver);
+        getActivity().unregisterReceiver(mBluetoothA2dpReceiver);
     }
 
     void onEnableDevelopmentOptionsConfirmed() {
@@ -244,7 +332,8 @@
     }
 
     private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
-            Activity activity, Lifecycle lifecycle, DevelopmentSettingsDashboardFragment fragment) {
+            Activity activity, Lifecycle lifecycle, DevelopmentSettingsDashboardFragment fragment,
+            Object bluetoothA2dpLock) {
         final List<AbstractPreferenceController> controllers = new ArrayList<>();
         controllers.add(new BugReportPreferenceControllerV2(context));
         controllers.add(new LocalBackupPasswordPreferenceController(context));
@@ -270,7 +359,7 @@
         controllers.add(new WaitForDebuggerPreferenceController(context));
         controllers.add(new VerifyAppsOverUsbPreferenceControllerV2(context));
         controllers.add(new LogdSizePreferenceControllerV2(context));
-        // store logger data persistently on device
+        controllers.add(new LogPersistPreferenceControllerV2(context, fragment, lifecycle));
         controllers.add(new ConnectivityMonitorPreferenceControllerV2(context));
         controllers.add(new CameraLaserSensorPreferenceControllerV2(context));
         controllers.add(new CameraHalHdrPlusPreferenceControllerV2(context));
@@ -285,9 +374,10 @@
         controllers.add(new BluetoothDeviceNoNamePreferenceController(context));
         controllers.add(new BluetoothAbsoluteVolumePreferenceController(context));
         controllers.add(new BluetoothInbandRingingPreferenceController(context));
-        // bluetooth avrcp version
+        controllers.add(new BluetoothAvrcpVersionPreferenceController(context));
         // bluetooth audio codec
-        // bluetooth audio sample rate
+        controllers.add(new BluetoothAudioSampleRatePreferenceController(context, lifecycle,
+                bluetoothA2dpLock));
         // bluetooth audio bits per sample
         // bluetooth audio channel mode
         // bluetooth audio ldac codec: playback quality
@@ -296,19 +386,19 @@
         controllers.add(new ShowSurfaceUpdatesPreferenceController(context));
         controllers.add(new ShowLayoutBoundsPreferenceController(context));
         controllers.add(new RtlLayoutPreferenceController(context));
-        // window animation scale
+        controllers.add(new WindowAnimationScalePreferenceController(context));
         // transition animation scale
-        // animator duration scale
+        controllers.add(new AnimatorDurationScalePreferenceController(context));
         // simulate secondary displays
         // smallest width
         controllers.add(new ForceGpuRenderingPreferenceController(context));
         controllers.add(new GpuViewUpdatesPreferenceController(context));
         controllers.add(new HardwareLayersUpdatesPreferenceController(context));
-        // debug gpu overdraw
+        controllers.add(new DebugGpuOverdrawPreferenceController(context));
         // debug non-rectangular clip operations
         controllers.add(new ForceMSAAPreferenceController(context));
         controllers.add(new HardwareOverlaysPreferenceController(context));
-        // simulate color space
+        controllers.add(new SimulateColorSpacePreferenceController(context));
         // set gpu renderer
         controllers.add(new UsbAudioRoutingPreferenceController(context));
         controllers.add(new StrictModePreferenceController(context));
@@ -354,7 +444,8 @@
                 public List<AbstractPreferenceController> getPreferenceControllers(Context
                         context) {
                     return buildPreferenceControllers(context, null /* activity */,
-                            null /* lifecycle */, null /* devOptionsDashboardFragment */);
+                            null /* lifecycle */, null /* devOptionsDashboardFragment */,
+                            null /* bluetoothA2dpLock */);
                 }
             };
 }
diff --git a/src/com/android/settings/development/DisableLogPersistWarningDialog.java b/src/com/android/settings/development/DisableLogPersistWarningDialog.java
new file mode 100644
index 0000000..1ab3a92
--- /dev/null
+++ b/src/com/android/settings/development/DisableLogPersistWarningDialog.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.Fragment;
+import android.app.FragmentManager;
+import android.content.DialogInterface;
+import android.os.Bundle;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+
+public class DisableLogPersistWarningDialog extends InstrumentedDialogFragment implements
+        DialogInterface.OnClickListener, DialogInterface.OnDismissListener {
+
+    public static final String TAG = "DisableLogPersistDlg";
+
+    public static void show(LogPersistDialogHost host) {
+        if (!(host instanceof Fragment)) {
+            return;
+        }
+        final Fragment hostFragment = (Fragment) host;
+        final FragmentManager manager = hostFragment.getActivity().getFragmentManager();
+        if (manager.findFragmentByTag(TAG) == null) {
+            final DisableLogPersistWarningDialog dialog =
+                    new DisableLogPersistWarningDialog();
+            dialog.setTargetFragment(hostFragment, 0 /* requestCode */);
+            dialog.show(manager, TAG);
+        }
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.DIALOG_LOG_PERSIST;
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        return new AlertDialog.Builder(getActivity())
+                .setTitle(R.string.dev_logpersist_clear_warning_title)
+                .setMessage(R.string.dev_logpersist_clear_warning_message)
+                .setPositiveButton(android.R.string.yes, this /* onClickListener */)
+                .setNegativeButton(android.R.string.no, this /* onClickListener */)
+                .create();
+    }
+
+    @Override
+    public void onClick(DialogInterface dialog, int which) {
+        final LogPersistDialogHost host = (LogPersistDialogHost) getTargetFragment();
+        if (host == null) {
+            return;
+        }
+        if (which == DialogInterface.BUTTON_POSITIVE) {
+            host.onDisableLogPersistDialogConfirmed();
+        } else {
+            host.onDisableLogPersistDialogRejected();
+        }
+    }
+}
diff --git a/src/com/android/settings/development/LogPersistDialogHost.java b/src/com/android/settings/development/LogPersistDialogHost.java
new file mode 100644
index 0000000..0187e03
--- /dev/null
+++ b/src/com/android/settings/development/LogPersistDialogHost.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+/**
+ * Interface for LogPersistDialogFragment callbacks.
+ */
+public interface LogPersistDialogHost {
+
+    /**
+     * Called when the user presses yes on the warning dialog.
+     */
+    void onDisableLogPersistDialogConfirmed();
+
+    /**
+     * Called when the user presses no on the warning dialog.
+     */
+    void onDisableLogPersistDialogRejected();
+}
diff --git a/src/com/android/settings/development/LogPersistPreferenceControllerV2.java b/src/com/android/settings/development/LogPersistPreferenceControllerV2.java
new file mode 100644
index 0000000..537b71b
--- /dev/null
+++ b/src/com/android/settings/development/LogPersistPreferenceControllerV2.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import android.content.Context;
+import android.support.annotation.Nullable;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.development.AbstractLogpersistPreferenceController;
+
+public class LogPersistPreferenceControllerV2 extends
+        AbstractLogpersistPreferenceController implements PreferenceControllerMixin {
+
+    private final DevelopmentSettingsDashboardFragment mFragment;
+    private ListPreference mPreference;
+
+
+    public LogPersistPreferenceControllerV2(Context context,
+            DevelopmentSettingsDashboardFragment fragment, Lifecycle lifecycle) {
+        super(context, lifecycle);
+
+        mFragment = fragment;
+    }
+
+    @Override
+    public void showConfirmationDialog(@Nullable Preference preference) {
+        DisableLogPersistWarningDialog.show(mFragment);
+    }
+
+    @Override
+    public void dismissConfirmationDialog() {
+        // intentional no-op
+    }
+
+    @Override
+    public boolean isConfirmationDialogShowing() {
+        return false;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (ListPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        updateLogpersistValues();
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        writeLogpersistOption(null /* new value */, true);
+        mPreference.setEnabled(false);
+    }
+
+    public void onDisableLogPersistDialogConfirmed() {
+        setLogpersistOff(true);
+        updateLogpersistValues();
+    }
+
+    public void onDisableLogPersistDialogRejected() {
+        updateLogpersistValues();
+    }
+}
diff --git a/src/com/android/settings/development/LogpersistPreferenceController.java b/src/com/android/settings/development/LogpersistPreferenceController.java
index a1ca186..26ab878 100644
--- a/src/com/android/settings/development/LogpersistPreferenceController.java
+++ b/src/com/android/settings/development/LogpersistPreferenceController.java
@@ -27,6 +27,10 @@
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.development.AbstractLogpersistPreferenceController;
 
+/**
+ * depreacted in favor of {@link LogdSizePreferenceControllerV2}
+ */
+@Deprecated
 public class LogpersistPreferenceController extends AbstractLogpersistPreferenceController
         implements PreferenceControllerMixin {
 
diff --git a/src/com/android/settings/development/SimulateColorSpacePreferenceController.java b/src/com/android/settings/development/SimulateColorSpacePreferenceController.java
new file mode 100644
index 0000000..985e878
--- /dev/null
+++ b/src/com/android/settings/development/SimulateColorSpacePreferenceController.java
@@ -0,0 +1,145 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.res.Resources;
+import android.provider.Settings;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.view.accessibility.AccessibilityManager;
+
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class SimulateColorSpacePreferenceController extends
+        DeveloperOptionsPreferenceController implements
+        Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
+
+    private static final String SIMULATE_COLOR_SPACE = "simulate_color_space";
+
+    @VisibleForTesting
+    static final int SETTING_VALUE_OFF = 0;
+    @VisibleForTesting
+    static final int SETTING_VALUE_ON = 1;
+
+    private ListPreference mPreference;
+
+    public SimulateColorSpacePreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return SIMULATE_COLOR_SPACE;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (ListPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        writeSimulateColorSpace(newValue);
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        updateSimulateColorSpace();
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    public void onDeveloperOptionsDisabled() {
+        if (usingDevelopmentColorSpace()) {
+            writeSimulateColorSpace(-1);
+        }
+        mPreference.setEnabled(false);
+    }
+
+    private void updateSimulateColorSpace() {
+        final ContentResolver cr = mContext.getContentResolver();
+        final boolean enabled = Settings.Secure.getInt(
+                cr, Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED, SETTING_VALUE_OFF)
+                != SETTING_VALUE_OFF;
+        if (enabled) {
+            final String mode = Integer.toString(Settings.Secure.getInt(
+                    cr, Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER,
+                    AccessibilityManager.DALTONIZER_DISABLED));
+            mPreference.setValue(mode);
+            final int index = mPreference.findIndexOfValue(mode);
+            if (index < 0) {
+                final Resources res = mContext.getResources();
+                // We're using a mode controlled by accessibility preferences.
+                mPreference.setSummary(res.getString(R.string.daltonizer_type_overridden,
+                        res.getString(R.string.accessibility_display_daltonizer_preference_title)));
+            } else {
+                mPreference.setSummary("%s");
+            }
+        } else {
+            mPreference.setValue(
+                    Integer.toString(AccessibilityManager.DALTONIZER_DISABLED));
+        }
+    }
+
+    private void writeSimulateColorSpace(Object value) {
+        final ContentResolver cr = mContext.getContentResolver();
+        final int newMode = Integer.parseInt(value.toString());
+        if (newMode < 0) {
+            Settings.Secure.putInt(cr, Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED,
+                    SETTING_VALUE_OFF);
+        } else {
+            Settings.Secure.putInt(cr, Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED,
+                    SETTING_VALUE_ON);
+            Settings.Secure.putInt(cr, Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER, newMode);
+        }
+    }
+
+    /**
+     * @return <code>true</code> if the color space preference is currently
+     * controlled by development settings
+     */
+    private boolean usingDevelopmentColorSpace() {
+        final ContentResolver cr = mContext.getContentResolver();
+        final boolean enabled = Settings.Secure.getInt(
+                cr, Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED, SETTING_VALUE_OFF)
+                != SETTING_VALUE_OFF;
+        if (enabled) {
+            final String mode = Integer.toString(Settings.Secure.getInt(
+                    cr, Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER,
+                    AccessibilityManager.DALTONIZER_DISABLED));
+            final int index = mPreference.findIndexOfValue(mode);
+            if (index >= 0) {
+                // We're using a mode controlled by developer preferences.
+                return true;
+            }
+        }
+        return false;
+    }
+}
diff --git a/src/com/android/settings/development/WindowAnimationScalePreferenceController.java b/src/com/android/settings/development/WindowAnimationScalePreferenceController.java
new file mode 100644
index 0000000..1a17fd2
--- /dev/null
+++ b/src/com/android/settings/development/WindowAnimationScalePreferenceController.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import android.content.Context;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.view.IWindowManager;
+
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class WindowAnimationScalePreferenceController extends
+        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
+        PreferenceControllerMixin {
+
+    private static final String WINDOW_ANIMATION_SCALE_KEY = "window_animation_scale";
+
+    @VisibleForTesting
+    static final int WINDOW_ANIMATION_SCALE_SELECTOR = 0;
+    @VisibleForTesting
+    static final float DEFAULT_VALUE = 1;
+
+    private final IWindowManager mWindowManager;
+    private final String[] mListValues;
+    private final String[] mListSummaries;
+
+    private ListPreference mPreference;
+
+    public WindowAnimationScalePreferenceController(Context context) {
+        super(context);
+
+        mWindowManager = IWindowManager.Stub.asInterface(
+                ServiceManager.getService(Context.WINDOW_SERVICE));
+        mListValues = context.getResources().getStringArray(R.array.window_animation_scale_values);
+        mListSummaries = context.getResources().getStringArray(
+                R.array.window_animation_scale_entries);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return WINDOW_ANIMATION_SCALE_KEY;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = (ListPreference) screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        writeAnimationScaleOption(newValue);
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        updateAnimationScaleValue();
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchEnabled() {
+        mPreference.setEnabled(true);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        writeAnimationScaleOption(null);
+        mPreference.setEnabled(false);
+    }
+
+    private void writeAnimationScaleOption(Object newValue) {
+        try {
+            float scale = newValue != null ? Float.parseFloat(newValue.toString()) : DEFAULT_VALUE;
+            mWindowManager.setAnimationScale(WINDOW_ANIMATION_SCALE_SELECTOR, scale);
+            updateAnimationScaleValue();
+        } catch (RemoteException e) {
+            // intentional no-op
+        }
+    }
+
+    private void updateAnimationScaleValue() {
+        try {
+            final float scale = mWindowManager.getAnimationScale(WINDOW_ANIMATION_SCALE_SELECTOR);
+            int index = 0; // default
+            for (int i = 0; i < mListValues.length; i++) {
+                float val = Float.parseFloat(mListValues[i]);
+                if (scale <= val) {
+                    index = i;
+                    break;
+                }
+            }
+            mPreference.setValue(mListValues[index]);
+            mPreference.setSummary(mListSummaries[index]);
+        } catch (RemoteException e) {
+            // intentional no-op
+        }
+    }
+}
diff --git a/src/com/android/settings/development/qstile/DevelopmentTileConfigFragment.java b/src/com/android/settings/development/qstile/DevelopmentTileConfigFragment.java
new file mode 100644
index 0000000..c822de0
--- /dev/null
+++ b/src/com/android/settings/development/qstile/DevelopmentTileConfigFragment.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development.qstile;
+
+import android.content.Context;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class DevelopmentTileConfigFragment extends DashboardFragment {
+    private static final String TAG = "DevelopmentTileConfig";
+
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.placeholder_prefs;
+    }
+
+    @Override
+    protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
+        controllers.add(new DevelopmentTilePreferenceController(context));
+        return controllers;
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.DEVELOPMENT_QS_TILE_CONFIG;
+    }
+}
diff --git a/src/com/android/settings/development/qstile/DevelopmentTilePreferenceController.java b/src/com/android/settings/development/qstile/DevelopmentTilePreferenceController.java
new file mode 100644
index 0000000..083a719
--- /dev/null
+++ b/src/com/android/settings/development/qstile/DevelopmentTilePreferenceController.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development.qstile;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.content.pm.ServiceInfo;
+import android.service.quicksettings.TileService;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settingslib.core.AbstractPreferenceController;
+
+import java.util.List;
+
+public class DevelopmentTilePreferenceController extends AbstractPreferenceController {
+
+    private final OnChangeHandler mOnChangeHandler;
+    private final PackageManager mPackageManager;
+
+    public DevelopmentTilePreferenceController(Context context) {
+        super(context);
+        mOnChangeHandler = new OnChangeHandler(context);
+        mPackageManager = context.getPackageManager();
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return null;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        Context context = screen.getContext();
+        Intent intent = new Intent(TileService.ACTION_QS_TILE)
+                .setPackage(context.getPackageName());
+        final List<ResolveInfo> resolveInfos = mPackageManager.queryIntentServices(intent,
+                PackageManager.MATCH_DISABLED_COMPONENTS);
+        for (ResolveInfo info : resolveInfos) {
+            ServiceInfo sInfo = info.serviceInfo;
+            final int enabledSetting = mPackageManager.getComponentEnabledSetting(
+                    new ComponentName(sInfo.packageName, sInfo.name));
+            boolean checked = enabledSetting == PackageManager.COMPONENT_ENABLED_STATE_ENABLED
+                    || ((enabledSetting == PackageManager.COMPONENT_ENABLED_STATE_DEFAULT)
+                    && sInfo.enabled);
+
+            SwitchPreference preference = new SwitchPreference(context);
+            preference.setTitle(sInfo.loadLabel(mPackageManager));
+            preference.setIcon(sInfo.icon);
+            preference.setKey(sInfo.name);
+            preference.setChecked(checked);
+            preference.setOnPreferenceChangeListener(mOnChangeHandler);
+            screen.addPreference(preference);
+        }
+    }
+
+    private static class OnChangeHandler implements Preference.OnPreferenceChangeListener {
+
+        private final Context mContext;
+        private final PackageManager mPackageManager;
+
+        public OnChangeHandler(Context context) {
+            mContext = context;
+            mPackageManager = context.getPackageManager();
+        }
+
+        @Override
+        public boolean onPreferenceChange(Preference preference, Object newValue) {
+            ComponentName cn = new ComponentName(
+                    mContext.getPackageName(), preference.getKey());
+            mPackageManager.setComponentEnabledSetting(cn, (Boolean) newValue
+                            ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED
+                            : PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
+                    PackageManager.DONT_KILL_APP);
+            return true;
+        }
+    }
+}
diff --git a/src/com/android/settings/qstile/DevelopmentTiles.java b/src/com/android/settings/development/qstile/DevelopmentTiles.java
similarity index 98%
rename from src/com/android/settings/qstile/DevelopmentTiles.java
rename to src/com/android/settings/development/qstile/DevelopmentTiles.java
index f05977b..bc3fcb5 100644
--- a/src/com/android/settings/qstile/DevelopmentTiles.java
+++ b/src/com/android/settings/development/qstile/DevelopmentTiles.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.android.settings.qstile;
+package com.android.settings.development.qstile;
 
 import android.os.RemoteException;
 import android.os.SystemProperties;
diff --git a/src/com/android/settings/language/LanguageAndInputSettings.java b/src/com/android/settings/language/LanguageAndInputSettings.java
index 19b1a9f..79f9ded 100644
--- a/src/com/android/settings/language/LanguageAndInputSettings.java
+++ b/src/com/android/settings/language/LanguageAndInputSettings.java
@@ -177,7 +177,6 @@
                     // Duplicates in summary and details pages.
                     keys.add(KEY_TEXT_TO_SPEECH);
                     keys.add(KEY_PHYSICAL_KEYBOARD);
-
                     return keys;
                 }
             };
diff --git a/src/com/android/settings/language/PhoneLanguagePreferenceController.java b/src/com/android/settings/language/PhoneLanguagePreferenceController.java
index 11c3e03..e7b0c72 100644
--- a/src/com/android/settings/language/PhoneLanguagePreferenceController.java
+++ b/src/com/android/settings/language/PhoneLanguagePreferenceController.java
@@ -23,6 +23,8 @@
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.core.AbstractPreferenceController;
 
+import java.util.List;
+
 public class PhoneLanguagePreferenceController extends AbstractPreferenceController
         implements PreferenceControllerMixin {
 
@@ -48,6 +50,13 @@
     }
 
     @Override
+    public void updateNonIndexableKeys(List<String> keys) {
+        // No index needed, because this pref has the same name as the parent page. Indexing it will
+        // make search page look like there are duplicate result, creating confusion.
+        keys.add(getPreferenceKey());
+    }
+
+    @Override
     public String getPreferenceKey() {
         return KEY_PHONE_LANGUAGE;
     }
diff --git a/src/com/android/settings/qstile/DevelopmentTileConfigActivity.java b/src/com/android/settings/qstile/DevelopmentTileConfigActivity.java
deleted file mode 100644
index 5968d7a..0000000
--- a/src/com/android/settings/qstile/DevelopmentTileConfigActivity.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.qstile;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.content.pm.ServiceInfo;
-import android.os.Bundle;
-import android.service.quicksettings.TileService;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.Preference;
-
-import com.android.settings.SettingsActivity;
-import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.core.instrumentation.Instrumentable;
-
-public class DevelopmentTileConfigActivity extends SettingsActivity {
-
-    @Override
-    public Intent getIntent() {
-        Intent modIntent = new Intent(super.getIntent())
-                .putExtra(EXTRA_SHOW_FRAGMENT, DevelopmentTileConfigFragment.class.getName())
-                .putExtra(EXTRA_HIDE_DRAWER, true);
-        return modIntent;
-    }
-
-    @Override
-    protected boolean isValidFragment(String fragmentName) {
-        return (DevelopmentTileConfigFragment.class.getName().equals(fragmentName));
-    }
-
-    public static class DevelopmentTileConfigFragment extends SettingsPreferenceFragment
-            implements Preference.OnPreferenceChangeListener {
-
-        @Override
-        public void onCreate(Bundle icicle) {
-            super.onCreate(icicle);
-
-            Context context = getPrefContext();
-            setPreferenceScreen(getPreferenceManager().createPreferenceScreen(context));
-            getPreferenceScreen().removeAll();
-
-            Intent intent = new Intent(TileService.ACTION_QS_TILE)
-                    .setPackage(context.getPackageName());
-            PackageManager pm = getPackageManager();
-            for (ResolveInfo info :
-                    pm.queryIntentServices(intent, PackageManager.MATCH_DISABLED_COMPONENTS)) {
-                ServiceInfo sInfo = info.serviceInfo;
-                int enabledSetting = pm.getComponentEnabledSetting(
-                        new ComponentName(sInfo.packageName, sInfo.name));
-                boolean checked = enabledSetting == PackageManager.COMPONENT_ENABLED_STATE_ENABLED
-                        || ((enabledSetting == PackageManager.COMPONENT_ENABLED_STATE_DEFAULT)
-                        && sInfo.enabled);
-
-                SwitchPreference preference = new SwitchPreference(context);
-                preference.setTitle(sInfo.loadLabel(pm));
-                preference.setIcon(sInfo.icon);
-                preference.setKey(sInfo.name);
-                preference.setChecked(checked);
-                preference.setPersistent(false);
-                preference.setOnPreferenceChangeListener(this);
-                getPreferenceScreen().addPreference(preference);
-            }
-        }
-
-        @Override
-        public int getMetricsCategory() {
-            return Instrumentable.METRICS_CATEGORY_UNKNOWN;
-        }
-
-        @Override
-        public boolean onPreferenceChange(Preference preference, Object newValue) {
-            ComponentName cn = new ComponentName(
-                    getPrefContext().getPackageName(), preference.getKey());
-            getPackageManager().setComponentEnabledSetting(cn, (Boolean) newValue
-                            ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED
-                            : PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
-                    PackageManager.DONT_KILL_APP);
-            return true;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 98af552..d4ba006 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -68,6 +68,7 @@
 import com.android.settingslib.wifi.AccessPoint;
 import com.android.settingslib.wifi.AccessPoint.AccessPointListener;
 import com.android.settingslib.wifi.AccessPointPreference;
+import com.android.settingslib.wifi.WifiSavedConfigUtils;
 import com.android.settingslib.wifi.WifiTracker;
 import com.android.settingslib.wifi.WifiTrackerFactory;
 
@@ -1121,7 +1122,8 @@
 
                 // Add saved Wi-Fi access points
                 final List<AccessPoint> accessPoints =
-                        WifiTracker.getCurrentAccessPoints(context, true, false);
+                        WifiSavedConfigUtils.getAllConfigs(context,
+                                context.getSystemService(WifiManager.class));
                 for (AccessPoint accessPoint : accessPoints) {
                     data = new SearchIndexableRaw(context);
                     data.title = accessPoint.getSsidStr();
diff --git a/tests/robotests/assets/grandfather_not_implementing_index_provider b/tests/robotests/assets/grandfather_not_implementing_index_provider
index 9b86ced..fda5c8a 100644
--- a/tests/robotests/assets/grandfather_not_implementing_index_provider
+++ b/tests/robotests/assets/grandfather_not_implementing_index_provider
@@ -5,6 +5,7 @@
 com.android.settings.fuelgauge.PowerUsageAnomalyDetails
 com.android.settings.fuelgauge.AdvancedPowerUsageDetail
 com.android.settings.development.featureflags.FeatureFlagsDashboard
+com.android.settings.development.qstile.DevelopmentTileConfigFragment
 com.android.settings.deviceinfo.StorageProfileFragment
 com.android.settings.wifi.details.WifiNetworkDetailsFragment
 com.android.settings.wifi.p2p.WifiP2pSettings
diff --git a/tests/robotests/assets/grandfather_not_implementing_indexable b/tests/robotests/assets/grandfather_not_implementing_indexable
index bbb4bb2..17c8133 100644
--- a/tests/robotests/assets/grandfather_not_implementing_indexable
+++ b/tests/robotests/assets/grandfather_not_implementing_indexable
@@ -72,7 +72,6 @@
 com.android.settings.notification.ZenModeSettings
 com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment
 com.android.settings.localepicker.LocaleListEditor
-com.android.settings.qstile.DevelopmentTileConfigActivity$DevelopmentTileConfigFragment
 com.android.settings.applications.ExternalSourcesDetails
 com.android.settings.applications.PictureInPictureSettings
 com.android.settings.applications.PictureInPictureDetails
diff --git a/tests/robotests/src/android/bluetooth/BluetoothCodecConfig.java b/tests/robotests/src/android/bluetooth/BluetoothCodecConfig.java
index 40b76df..c6350ef 100644
--- a/tests/robotests/src/android/bluetooth/BluetoothCodecConfig.java
+++ b/tests/robotests/src/android/bluetooth/BluetoothCodecConfig.java
@@ -20,4 +20,15 @@
  * A placeholder class to prevent ClassNotFound exceptions caused by lack of visibility.
  */
 public class BluetoothCodecConfig {
+
+    public static final int SAMPLE_RATE_NONE = 0;
+    public static final int SAMPLE_RATE_48000 = 0x1 << 1;
+    public static final int SOURCE_CODEC_TYPE_INVALID = 1000 * 1000;
+    public static final int CODEC_PRIORITY_DEFAULT = 0;
+    public static final int BITS_PER_SAMPLE_NONE = 0;
+    public static final int CHANNEL_MODE_NONE = 0;
+
+    public int getSampleRate() {
+        return 0;
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/development/AnimatorDurationScalePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AnimatorDurationScalePreferenceControllerTest.java
new file mode 100644
index 0000000..5acaf0a
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/AnimatorDurationScalePreferenceControllerTest.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import static com.android.settings.development.AnimatorDurationScalePreferenceController
+        .ANIMATOR_DURATION_SCALE_SELECTOR;
+import static com.android.settings.development.AnimatorDurationScalePreferenceController
+        .DEFAULT_VALUE;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.RemoteException;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.PreferenceScreen;
+import android.view.IWindowManager;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class AnimatorDurationScalePreferenceControllerTest {
+
+    @Mock
+    private ListPreference mPreference;
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private IWindowManager mWindowManager;
+
+    /**
+     * 0: Animation off
+     * 1: Animation scale .5x
+     * 2: Animation scale 1x
+     * 3: Animation scale 1.5x
+     * 4: Animation scale 2x
+     * 5: Animation scale 5x
+     * 6: Animation scale 10x
+     */
+    private String[] mListValues;
+    private String[] mListSummaries;
+    private Context mContext;
+    private AnimatorDurationScalePreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mListValues = mContext.getResources().getStringArray(
+                R.array.animator_duration_scale_values);
+        mListSummaries = mContext.getResources().getStringArray(
+                R.array.animator_duration_scale_entries);
+        mController = new AnimatorDurationScalePreferenceController(mContext);
+        ReflectionHelpers.setField(mController, "mWindowManager", mWindowManager);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        mController.displayPreference(mScreen);
+    }
+
+    @Test
+    public void onPreferenceChange_noValueSet_shouldSetDefault() throws RemoteException {
+        mController.onPreferenceChange(mPreference, null /* new value */);
+
+        verify(mWindowManager).setAnimationScale(ANIMATOR_DURATION_SCALE_SELECTOR, DEFAULT_VALUE);
+    }
+
+    @Test
+    public void onPreferenceChange_option5Selected_shouldSetOption5() throws RemoteException {
+        mController.onPreferenceChange(mPreference, mListValues[5]);
+
+        verify(mWindowManager).setAnimationScale(ANIMATOR_DURATION_SCALE_SELECTOR,
+                Float.valueOf(mListValues[5]));
+    }
+
+    @Test
+    public void updateState_option5Set_shouldUpdatePreferenceToOption5() throws RemoteException {
+        when(mWindowManager.getAnimationScale(ANIMATOR_DURATION_SCALE_SELECTOR)).thenReturn(
+                Float.valueOf(mListValues[5]));
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setValue(mListValues[5]);
+        verify(mPreference).setSummary(mListSummaries[5]);
+    }
+
+    @Test
+    public void updateState_option3Set_shouldUpdatePreferenceToOption3() throws RemoteException {
+        when(mWindowManager.getAnimationScale(ANIMATOR_DURATION_SCALE_SELECTOR)).thenReturn(
+                Float.valueOf(mListValues[3]));
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setValue(mListValues[3]);
+        verify(mPreference).setSummary(mListSummaries[3]);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() throws RemoteException {
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        verify(mWindowManager).setAnimationScale(ANIMATOR_DURATION_SCALE_SELECTOR, DEFAULT_VALUE);
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() throws RemoteException {
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioSampleRatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioSampleRatePreferenceControllerTest.java
new file mode 100644
index 0000000..de8c72a
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioSampleRatePreferenceControllerTest.java
@@ -0,0 +1,168 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import static com.android.settings.development.BluetoothAudioSampleRatePreferenceController
+        .STREAMING_LABEL_ID;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.bluetooth.BluetoothA2dp;
+import android.bluetooth.BluetoothCodecConfig;
+import android.content.Context;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class BluetoothAudioSampleRatePreferenceControllerTest {
+
+    @Mock
+    private BluetoothA2dp mBluetoothA2dp;
+    @Mock
+    private BluetoothCodecConfig mBluetoothCodecConfig;
+    @Mock
+    private ListPreference mPreference;
+    @Mock
+    private PreferenceScreen mScreen;
+
+    /**
+     * 0: Use System Selection (Default)
+     * 1: 44.1 kHz
+     * 2: 48.0 kHz
+     * 3: 88.2 kHz
+     * 4: 96.0 kHz
+     */
+    private String[] mListValues;
+    private String[] mListSummaries;
+    private Lifecycle mLifecycle;
+    private Context mContext;
+    private BluetoothAudioSampleRatePreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mLifecycle = new Lifecycle();
+        mController = spy(new BluetoothAudioSampleRatePreferenceController(mContext, mLifecycle,
+                new Object()));
+        doReturn(mBluetoothCodecConfig).when(mController).getCodecConfig();
+        doNothing().when(mController).setCodecConfigPreference(any());
+        doReturn(mBluetoothCodecConfig).when(mController).createCodecConfig(anyInt(), anyInt(),
+                anyInt(), anyInt(), anyInt(), anyLong(), anyLong(), anyLong(), anyLong());
+        mListValues = mContext.getResources().getStringArray(
+                R.array.bluetooth_a2dp_codec_sample_rate_values);
+        mListSummaries = mContext.getResources().getStringArray(
+                R.array.bluetooth_a2dp_codec_sample_rate_summaries);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        mController.displayPreference(mScreen);
+    }
+
+    @Test
+    public void updateState_nothingSet_shouldUpdateToDefault() {
+        mController.updateState(mPreference);
+
+        verify(mPreference).setValue(mListValues[0]);
+        verify(mPreference).setSummary(
+                mContext.getResources().getString(STREAMING_LABEL_ID, mListSummaries[0]));
+    }
+
+    @Test
+    public void updateState_option2Set_shouldUpdateToOption2() {
+        when(mBluetoothCodecConfig.getSampleRate()).thenReturn(
+                BluetoothCodecConfig.SAMPLE_RATE_48000);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setValue(mListValues[2]);
+        verify(mPreference).setSummary(
+                mContext.getResources().getString(STREAMING_LABEL_ID, mListSummaries[2]));
+        assertThat(BluetoothA2dpSharedStore.getSampleRate()).isEqualTo(
+                BluetoothCodecConfig.SAMPLE_RATE_48000);
+    }
+
+    @Test
+    public void onPreferenceChange_bluetoothConnected_shouldUpdateCodec() {
+        mController.onBluetoothServiceConnected(mBluetoothA2dp);
+
+        mController.onPreferenceChange(mPreference, "" /* new value */);
+
+        verify(mController).setCodecConfigPreference(any());
+    }
+
+    @Test
+    public void onPreferenceChange_bluetoothNotConnected_shouldUpdateCodec() {
+        mController.onBluetoothServiceDisconnected();
+
+        mController.onPreferenceChange(mPreference, "" /* new value */);
+
+        verify(mController, never()).setCodecConfigPreference(any());
+    }
+
+    @Test
+    public void onBluetoothServiceConnected_shouldUpdateState() {
+        mController.onBluetoothServiceConnected(mBluetoothA2dp);
+
+        verify(mController).updateState(mPreference);
+    }
+
+    @Test
+    public void onBluetoothCodecUpdated_shouldUpdateState() {
+        mController.onBluetoothCodecUpdated();
+
+        verify(mController).updateState(mPreference);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        verify(mPreference).setEnabled(false);
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceControllerTest.java
new file mode 100644
index 0000000..07d0e50
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceControllerTest.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import static com.android.settings.development.BluetoothAvrcpVersionPreferenceController
+        .BLUETOOTH_AVRCP_VERSION_PROPERTY;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION,
+        shadows = {SettingsShadowSystemProperties.class})
+public class BluetoothAvrcpVersionPreferenceControllerTest {
+
+    @Mock
+    private ListPreference mPreference;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+
+    private Context mContext;
+    private BluetoothAvrcpVersionPreferenceController mController;
+
+    /**
+     * 0: AVRCP 1.4 (Default)
+     * 1: AVRCP 1.3
+     * 2: AVRCP 1.5
+     * 3: AVRCP 1.6
+     */
+    private String[] mListValues;
+    private String[] mListSummaries;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mListValues = mContext.getResources().getStringArray(
+                R.array.bluetooth_avrcp_version_values);
+        mListSummaries = mContext.getResources().getStringArray(R.array.bluetooth_avrcp_versions);
+        mController = new BluetoothAvrcpVersionPreferenceController(mContext);
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+                mPreference);
+        mController.displayPreference(mPreferenceScreen);
+    }
+
+    @After
+    public void teardown() {
+        SettingsShadowSystemProperties.clear();
+    }
+
+    @Test
+    public void onPreferenceChange_setAvrcp13_shouldEnableAvrcp13() {
+        mController.onPreferenceChange(mPreference, mListValues[1]);
+
+        final String currentValue = SystemProperties.get(BLUETOOTH_AVRCP_VERSION_PROPERTY);
+
+        assertThat(currentValue).isEqualTo(mListValues[1]);
+    }
+
+    @Test
+    public void onPreferenceChange_setAvrcp15_shouldEnableAvrcp15() {
+        mController.onPreferenceChange(mPreference, mListValues[2]);
+
+        final String currentValue = SystemProperties.get(BLUETOOTH_AVRCP_VERSION_PROPERTY);
+
+        assertThat(currentValue).isEqualTo(mListValues[2]);
+    }
+
+    @Test
+    public void updateState_setAvrcp13_shouldSetPreferenceToAvrcp13() {
+        SystemProperties.set(BLUETOOTH_AVRCP_VERSION_PROPERTY, mListValues[1]);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setValue(mListValues[1]);
+        verify(mPreference).setSummary(mListSummaries[1]);
+    }
+
+    @Test
+    public void updateState_setAvrcp15_shouldSetPreferenceToAvrcp15() {
+        SystemProperties.set(BLUETOOTH_AVRCP_VERSION_PROPERTY, mListValues[2]);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setValue(mListValues[2]);
+        verify(mPreference).setSummary(mListSummaries[2]);
+    }
+
+    @Test
+    public void updateState_noValueSet_shouldSetDefaultToAvrcp14() {
+        mController.updateState(mPreference);
+
+        verify(mPreference).setValue(mListValues[0]);
+        verify(mPreference).setSummary(mListSummaries[0]);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/DebugGpuOverdrawPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DebugGpuOverdrawPreferenceControllerTest.java
new file mode 100644
index 0000000..2a35993
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/DebugGpuOverdrawPreferenceControllerTest.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.PreferenceScreen;
+import android.view.ThreadedRenderer;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION,
+        shadows = {SettingsShadowSystemProperties.class})
+public class DebugGpuOverdrawPreferenceControllerTest {
+
+    @Mock
+    private ListPreference mPreference;
+    @Mock
+    private PreferenceScreen mScreen;
+
+    /**
+     * 0: off
+     * 1: Show overdraw areas
+     * 2: Show areas for Deuteranomaly
+     */
+    private String[] mListValues;
+    private String[] mListSummaries;
+    private Context mContext;
+    private DebugGpuOverdrawPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mListValues = mContext.getResources().getStringArray(R.array.debug_hw_overdraw_values);
+        mListSummaries = mContext.getResources().getStringArray(
+                R.array.debug_hw_overdraw_entries);
+        mController = new DebugGpuOverdrawPreferenceController(mContext);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        mController.displayPreference(mScreen);
+    }
+
+    @After
+    public void teardown() {
+        SettingsShadowSystemProperties.clear();
+    }
+
+    @Test
+    public void onPreferenceChange_noValueSet_shouldSetEmptyString() {
+        mController.onPreferenceChange(mPreference, null /* new value */);
+
+        String mode = SystemProperties.get(ThreadedRenderer.DEBUG_OVERDRAW_PROPERTY);
+        assertThat(mode).isEqualTo("");
+    }
+
+    @Test
+    public void onPreferenceChange_option1Selected_shouldSetOption1() {
+        mController.onPreferenceChange(mPreference, mListValues[1]);
+
+        String mode = SystemProperties.get(ThreadedRenderer.DEBUG_OVERDRAW_PROPERTY);
+        assertThat(mode).isEqualTo(mListValues[1]);
+    }
+
+    @Test
+    public void updateState_option1Set_shouldUpdatePreferenceToOption1() {
+        SystemProperties.set(ThreadedRenderer.DEBUG_OVERDRAW_PROPERTY, mListValues[1]);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setValue(mListValues[1]);
+        verify(mPreference).setSummary(mListSummaries[1]);
+    }
+
+    @Test
+    public void updateState_option2Set_shouldUpdatePreferenceToOption2() {
+        SystemProperties.set(ThreadedRenderer.DEBUG_OVERDRAW_PROPERTY, mListValues[2]);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setValue(mListValues[2]);
+        verify(mPreference).setSummary(mListSummaries[2]);
+    }
+
+    @Test
+    public void updateState_noOptionSet_shouldDefaultToOption0() {
+        SystemProperties.set(ThreadedRenderer.DEBUG_OVERDRAW_PROPERTY, null);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setValue(mListValues[0]);
+        verify(mPreference).setSummary(mListSummaries[0]);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java
index ec51868..ac09418 100644
--- a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java
@@ -17,6 +17,7 @@
 package com.android.settings.development;
 
 import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
@@ -220,6 +221,28 @@
         verify(controller).onClearAdbKeysConfirmed();
     }
 
+    @Test
+    public void onDisableLogPersistDialogConfirmed_shouldCallControllerDialogConfirmed() {
+        final LogPersistPreferenceControllerV2 controller = mock(
+                LogPersistPreferenceControllerV2.class);
+        doReturn(controller).when(mDashboard).getDevelopmentOptionsController(
+                LogPersistPreferenceControllerV2.class);
+        mDashboard.onDisableLogPersistDialogConfirmed();
+
+        verify(controller).onDisableLogPersistDialogConfirmed();
+    }
+
+    @Test
+    public void onDisableLogPersistDialogRejected_shouldCallControllerDialogRejected() {
+        final LogPersistPreferenceControllerV2 controller = mock(
+                LogPersistPreferenceControllerV2.class);
+        doReturn(controller).when(mDashboard).getDevelopmentOptionsController(
+                LogPersistPreferenceControllerV2.class);
+        mDashboard.onDisableLogPersistDialogRejected();
+
+        verify(controller).onDisableLogPersistDialogRejected();
+    }
+
     @Implements(EnableDevelopmentSettingWarningDialog.class)
     public static class ShadowEnableDevelopmentSettingWarningDialog {
 
diff --git a/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerV2Test.java b/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerV2Test.java
new file mode 100644
index 0000000..3a7604a
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerV2Test.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.support.v4.content.LocalBroadcastManager;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
+import com.android.settingslib.R;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION,
+        shadows = {SettingsShadowSystemProperties.class})
+public class LogPersistPreferenceControllerV2Test {
+
+    @Mock
+    private ListPreference mPreference;
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private DevelopmentSettingsDashboardFragment mFragment;
+
+    private Context mContext;
+    private LogPersistPreferenceControllerV2 mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = new LogPersistPreferenceControllerV2(mContext, mFragment, new Lifecycle());
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        SystemProperties.set("ro.debuggable", "1");
+        mController.displayPreference(mScreen);
+    }
+
+    @After
+    public void teardown() {
+        SettingsShadowSystemProperties.clear();
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/LogpersistPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/LogpersistPreferenceControllerTest.java
index 450f29d..379890e 100644
--- a/tests/robotests/src/com/android/settings/development/LogpersistPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/LogpersistPreferenceControllerTest.java
@@ -32,6 +32,10 @@
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
+/**
+ * deprecated in favor of {@link LogPersistPreferenceControllerV2}
+ */
+@Deprecated
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class LogpersistPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/SimulateColorSpacePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/SimulateColorSpacePreferenceControllerTest.java
new file mode 100644
index 0000000..23c6e4c
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/SimulateColorSpacePreferenceControllerTest.java
@@ -0,0 +1,174 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import static com.android.settings.development.SimulateColorSpacePreferenceController
+        .SETTING_VALUE_OFF;
+import static com.android.settings.development.SimulateColorSpacePreferenceController
+        .SETTING_VALUE_ON;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.provider.Settings;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class SimulateColorSpacePreferenceControllerTest {
+
+    @Mock
+    private ListPreference mPreference;
+    @Mock
+    private PreferenceScreen mScreen;
+
+    /**
+     * 0: Disabled
+     * 1: Monochromacy
+     * 2: Deuteranomaly (red-green)
+     * 3: Protanomaly (red-green)
+     * 4: Tritanomaly (blue-yellow)
+     */
+    private String[] mListValues;
+    private Context mContext;
+    private SimulateColorSpacePreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mListValues = mContext.getResources().getStringArray(R.array.simulate_color_space_values);
+        mController = new SimulateColorSpacePreferenceController(mContext);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        mController.displayPreference(mScreen);
+    }
+
+    @Test
+    public void onPreferenceChange_disabledSelected_shouldTurnOffPreference()
+            throws Settings.SettingNotFoundException {
+        mController.onPreferenceChange(mPreference, mListValues[0]);
+
+        final int enabled = Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED);
+
+        assertThat(enabled).isEqualTo(SETTING_VALUE_OFF);
+    }
+
+    @Test
+    public void onPreferenceChange_monochromacySelected_shouldEnableAndSelectPreference()
+            throws Settings.SettingNotFoundException {
+        mController.onPreferenceChange(mPreference, mListValues[1]);
+
+        final int enabled = Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED);
+        final int settingValue = Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER);
+
+        assertThat(enabled).isEqualTo(SETTING_VALUE_ON);
+        assertThat(settingValue).isEqualTo(Integer.valueOf(mListValues[1]));
+    }
+
+    @Test
+    public void updateState_settingOff_shouldSetValueToDisabled() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED, SETTING_VALUE_OFF);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setValue(mListValues[0]);
+    }
+
+    @Test
+    public void updateState_settingOnMonochromacyEnabled_shouldSelectMonochromacy() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED, SETTING_VALUE_ON);
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER, Integer.valueOf(mListValues[1]));
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setValue(mListValues[1]);
+        verify(mPreference).setSummary("%s");
+    }
+
+    @Test
+    public void updateState_settingOnControlledByAccessibility_shouldSetOverridedSummary() {
+        Resources res = mContext.getResources();
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED, SETTING_VALUE_ON);
+        when(mPreference.findIndexOfValue(anyString())).thenReturn(-1);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setSummary(res.getString(R.string.daltonizer_type_overridden,
+                res.getString(R.string.accessibility_display_daltonizer_preference_title)));
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_notControlledByDevOptions_shouldDisableAndReset()
+            throws Settings.SettingNotFoundException {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED, SETTING_VALUE_ON);
+        when(mPreference.findIndexOfValue(anyString())).thenReturn(-1);
+
+        mController.onDeveloperOptionsDisabled();
+
+        final int settingValue = Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED);
+        assertThat(settingValue).isEqualTo(SETTING_VALUE_ON);
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_controlledByDevOptions_shouldDisableAndNotReset()
+            throws Settings.SettingNotFoundException {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED, SETTING_VALUE_ON);
+
+        mController.onDeveloperOptionsDisabled();
+
+        final int settingValue = Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED);
+        assertThat(settingValue).isEqualTo(SETTING_VALUE_OFF);
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() {
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/WindowAnimationScalePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WindowAnimationScalePreferenceControllerTest.java
new file mode 100644
index 0000000..0fbff3b
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/WindowAnimationScalePreferenceControllerTest.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import static com.android.settings.development.WindowAnimationScalePreferenceController
+        .DEFAULT_VALUE;
+import static com.android.settings.development.WindowAnimationScalePreferenceController
+        .WINDOW_ANIMATION_SCALE_SELECTOR;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.RemoteException;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.PreferenceScreen;
+import android.view.IWindowManager;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class WindowAnimationScalePreferenceControllerTest {
+
+    @Mock
+    private ListPreference mPreference;
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private IWindowManager mWindowManager;
+
+    /**
+     * 0: Animation off
+     * 1: Animation scale .5x
+     * 2: Animation scale 1x
+     * 3: Animation scale 1.5x
+     * 4: Animation scale 2x
+     * 5: Animation scale 5x
+     * 6: Animation scale 10x
+     */
+    private String[] mListValues;
+    private String[] mListSummaries;
+    private Context mContext;
+    private WindowAnimationScalePreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mListValues = mContext.getResources().getStringArray(R.array.window_animation_scale_values);
+        mListSummaries = mContext.getResources().getStringArray(
+                R.array.window_animation_scale_entries);
+        mController = new WindowAnimationScalePreferenceController(mContext);
+        ReflectionHelpers.setField(mController, "mWindowManager", mWindowManager);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        mController.displayPreference(mScreen);
+    }
+
+    @Test
+    public void onPreferenceChange_noValueSet_shouldSetDefault() throws RemoteException {
+        mController.onPreferenceChange(mPreference, null /* new value */);
+
+        verify(mWindowManager).setAnimationScale(WINDOW_ANIMATION_SCALE_SELECTOR, DEFAULT_VALUE);
+    }
+
+    @Test
+    public void onPreferenceChange_option5Selected_shouldSetOption5() throws RemoteException {
+        mController.onPreferenceChange(mPreference, mListValues[5]);
+
+        verify(mWindowManager).setAnimationScale(WINDOW_ANIMATION_SCALE_SELECTOR,
+                Float.valueOf(mListValues[5]));
+    }
+
+    @Test
+    public void updateState_option5Set_shouldUpdatePreferenceToOption5() throws RemoteException {
+        when(mWindowManager.getAnimationScale(WINDOW_ANIMATION_SCALE_SELECTOR)).thenReturn(
+                Float.valueOf(mListValues[5]));
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setValue(mListValues[5]);
+        verify(mPreference).setSummary(mListSummaries[5]);
+    }
+
+    @Test
+    public void updateState_option3Set_shouldUpdatePreferenceToOption3() throws RemoteException {
+        when(mWindowManager.getAnimationScale(WINDOW_ANIMATION_SCALE_SELECTOR)).thenReturn(
+                Float.valueOf(mListValues[3]));
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setValue(mListValues[3]);
+        verify(mPreference).setSummary(mListSummaries[3]);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() throws RemoteException {
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        verify(mWindowManager).setAnimationScale(WINDOW_ANIMATION_SCALE_SELECTOR, DEFAULT_VALUE);
+        verify(mPreference).setEnabled(false);
+    }
+
+    @Test
+    public void onDeveloperOptionsSwitchEnabled_shouldEnablePreference() throws RemoteException {
+        mController.onDeveloperOptionsSwitchEnabled();
+
+        verify(mPreference).setEnabled(true);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilePreferenceControllerTest.java
new file mode 100644
index 0000000..1cdff20
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilePreferenceControllerTest.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development.qstile;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.content.pm.ServiceInfo;
+import android.service.quicksettings.TileService;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.Shadows;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowPackageManager;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class DevelopmentTilePreferenceControllerTest {
+
+    @Mock
+    private PreferenceScreen mScreen;
+    private Context mContext;
+    private DevelopmentTilePreferenceController mController;
+    private ShadowPackageManager mShadowPackageManager;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mShadowPackageManager = Shadows.shadowOf(mContext.getPackageManager());
+        when(mScreen.getContext()).thenReturn(mContext);
+
+        mController = new DevelopmentTilePreferenceController(mContext);
+        assertThat(mController.getPreferenceKey()).isNull();
+    }
+
+    @Test
+    public void isAlwaysAvailable() {
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void display_hasTileService_shouldDisplay() {
+        final Intent tileProbe = new Intent(TileService.ACTION_QS_TILE)
+                .setPackage(mContext.getPackageName());
+        final ResolveInfo info = new ResolveInfo();
+        info.serviceInfo = new FakeServiceInfo();
+        info.serviceInfo.name = "abc";
+        info.serviceInfo.icon = R.drawable.ic_settings_24dp;
+        info.serviceInfo.packageName = mContext.getPackageName();
+        mShadowPackageManager.addResolveInfoForIntent(tileProbe, info);
+
+        mController.displayPreference(mScreen);
+
+        verify(mScreen).addPreference(any(Preference.class));
+    }
+
+    public static class FakeServiceInfo extends ServiceInfo {
+
+        public String loadLabel(PackageManager mgr) {
+            return "hi";
+        }
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java
index 4050dd1..7b315aa 100644
--- a/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java
@@ -16,12 +16,16 @@
 
 package com.android.settings.language;
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import android.content.Context;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -31,9 +35,8 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import java.util.ArrayList;
+import java.util.List;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
@@ -77,4 +80,11 @@
 
         verify(mPreference).setSummary(testSummary);
     }
+
+    @Test
+    public void testUpdateNonIndexable_shouldAddKey() {
+        final List<String> niks = new ArrayList<>();
+        mController.updateNonIndexableKeys(niks);
+        assertThat(niks).containsExactly(mController.getPreferenceKey());
+    }
 }