diff --git a/Settings/res/drawable-xhdpi/ic_settings_diagnostic.png b/Settings/res/drawable-xhdpi/ic_settings_diagnostic.png
new file mode 100644
index 0000000..7865596
--- /dev/null
+++ b/Settings/res/drawable-xhdpi/ic_settings_diagnostic.png
Binary files differ
diff --git a/Settings/res/values-af/strings.xml b/Settings/res/values-af/strings.xml
index b7bcd9c..b7947f3 100644
--- a/Settings/res/values-af/strings.xml
+++ b/Settings/res/values-af/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"Toeganklikheid"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"Ontwikkelaaropsies"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"Geen"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"Gebruik en diagnostiese inligting"</string>
     <string name="about_system_update" msgid="7282772247661356586">"Stelselopdatering"</string>
     <string name="about_preference" msgid="4131396784531360434">"Meer oor"</string>
     <string name="device_name" msgid="2670488158531273028">"Toestelnaam"</string>
diff --git a/Settings/res/values-am/strings.xml b/Settings/res/values-am/strings.xml
index b911657..0e20c88 100644
--- a/Settings/res/values-am/strings.xml
+++ b/Settings/res/values-am/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"ተደራሽነት"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"የገንቢ አማራጮች"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"ምንም"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"አጠቃቀም እና ምርመራ"</string>
     <string name="about_system_update" msgid="7282772247661356586">"የስርዓት ዝማኔ"</string>
     <string name="about_preference" msgid="4131396784531360434">"ስለ"</string>
     <string name="device_name" msgid="2670488158531273028">"የመሣሪያ ስም"</string>
diff --git a/Settings/res/values-ar/strings.xml b/Settings/res/values-ar/strings.xml
index 4812be8..d4389bf 100644
--- a/Settings/res/values-ar/strings.xml
+++ b/Settings/res/values-ar/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"إمكانية الوصول"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"خيارات مطور البرامج"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"غير متوفر"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"الاستخدام ومعلومات التشخيص"</string>
     <string name="about_system_update" msgid="7282772247661356586">"تحديث النظام"</string>
     <string name="about_preference" msgid="4131396784531360434">"حول"</string>
     <string name="device_name" msgid="2670488158531273028">"اسم الجهاز"</string>
diff --git a/Settings/res/values-az-rAZ/strings.xml b/Settings/res/values-az-rAZ/strings.xml
index 54eecec..fcc0e25 100644
--- a/Settings/res/values-az-rAZ/strings.xml
+++ b/Settings/res/values-az-rAZ/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"Əlçatımlılıq"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"Gəlişdirici seçimləri"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"Heç bir"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"İstifadə və Diaqnostika"</string>
     <string name="about_system_update" msgid="7282772247661356586">"Sistem güncəlləşdirməsi"</string>
     <string name="about_preference" msgid="4131396784531360434">"Haqqında"</string>
     <string name="device_name" msgid="2670488158531273028">"Cihaz adı"</string>
diff --git a/Settings/res/values-bg/strings.xml b/Settings/res/values-bg/strings.xml
index 4d73020..c0c9f29 100644
--- a/Settings/res/values-bg/strings.xml
+++ b/Settings/res/values-bg/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"Достъпност"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"Опции на програмиста"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"Няма"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"Употреба и диагностика"</string>
     <string name="about_system_update" msgid="7282772247661356586">"Системна актуализация"</string>
     <string name="about_preference" msgid="4131396784531360434">"Информация"</string>
     <string name="device_name" msgid="2670488158531273028">"Име на устройството"</string>
diff --git a/Settings/res/values-bn-rBD/strings.xml b/Settings/res/values-bn-rBD/strings.xml
index b0e3cbb..c2275ae 100644
--- a/Settings/res/values-bn-rBD/strings.xml
+++ b/Settings/res/values-bn-rBD/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"অ্যাক্সেসযোগ্যতা"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"বিকাশকারীর বিকল্পগুলি"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"কিছুই নয়"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"ব্যবহার ও ডায়াগনস্টিক"</string>
     <string name="about_system_update" msgid="7282772247661356586">"সিস্টেম আপডেট"</string>
     <string name="about_preference" msgid="4131396784531360434">"সম্পর্কে"</string>
     <string name="device_name" msgid="2670488158531273028">"ডিভাইস নাম"</string>
diff --git a/Settings/res/values-ca/strings.xml b/Settings/res/values-ca/strings.xml
index 1584732..fb98c48 100644
--- a/Settings/res/values-ca/strings.xml
+++ b/Settings/res/values-ca/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"Accessibilitat"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"Opcions per a desenvolupadors"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"Cap"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"Ús i diagnòstic"</string>
     <string name="about_system_update" msgid="7282772247661356586">"Actualització del sistema"</string>
     <string name="about_preference" msgid="4131396784531360434">"Quant a"</string>
     <string name="device_name" msgid="2670488158531273028">"Nom del dispositiu"</string>
diff --git a/Settings/res/values-cs/strings.xml b/Settings/res/values-cs/strings.xml
index 8a60657..ab14416 100644
--- a/Settings/res/values-cs/strings.xml
+++ b/Settings/res/values-cs/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"Usnadnění"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"Pro vývojáře"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"Žádné"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"Využití a diagnostika"</string>
     <string name="about_system_update" msgid="7282772247661356586">"Aktualizace systému"</string>
     <string name="about_preference" msgid="4131396784531360434">"O zařízení"</string>
     <string name="device_name" msgid="2670488158531273028">"Název zařízení"</string>
diff --git a/Settings/res/values-da/strings.xml b/Settings/res/values-da/strings.xml
index ca4e3e7..f4e1a7e 100644
--- a/Settings/res/values-da/strings.xml
+++ b/Settings/res/values-da/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"Hjælpefunktioner"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"Valgmuligheder for udviklere"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"Ingen"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"Forbrug og diagnostik"</string>
     <string name="about_system_update" msgid="7282772247661356586">"Systemopdatering"</string>
     <string name="about_preference" msgid="4131396784531360434">"Om"</string>
     <string name="device_name" msgid="2670488158531273028">"Enhedens navn"</string>
@@ -146,7 +147,7 @@
     <string name="title_wifi_no_networks_available" msgid="7127675763248224969">"Søger…"</string>
     <string name="title_wifi_could_not_save" msgid="708638317882707069">"Konfigurationen for <xliff:g id="SSID">%1$s</xliff:g> kunne ikke gemmes"</string>
     <string name="title_wifi_could_not_connect" msgid="9080004548419447580">"Der kunne ikke oprettes forbindelse til <xliff:g id="SSID">%1$s</xliff:g>"</string>
-    <string name="title_wifi_could_not_connect_timeout" msgid="5158184646985406394">"<xliff:g id="SSID">%1$s</xliff:g> kunne ikke findes"</string>
+    <string name="title_wifi_could_not_connect_timeout" msgid="5158184646985406394">"<xliff:g id="SSID">%1$s</xliff:g> blev ikke fundet"</string>
     <string name="title_wifi_could_not_connect_authentication_failure" msgid="4836595650380723944">"Wi-Fi-adgangskoden er ikke gyldig"</string>
     <string name="title_wifi_could_not_connect_ap_reject" msgid="328274688839033015">"Wi-Fi-netværket accepterede ikke forbindelsen"</string>
     <string name="title_wifi_advanced_options" msgid="5389467736846644832">"Vil du konfigurere proxy- og IP-indstillingerne for <xliff:g id="SSID">%1$s</xliff:g>?"</string>
@@ -280,7 +281,7 @@
     <string name="wifi_wps_instructions" msgid="3618110962669110034">"Tryk på knappen for Wi-Fi Protected Setup på din router.\nDen kaldes muligvis \"WPS\" eller indeholder symbolet til venstre."</string>
     <string name="wifi_wps_onstart_pin" msgid="594985182235834825">"Indtast pinkoden <xliff:g id="NUMBER">%1$s</xliff:g> på din Wi-Fi-router."</string>
     <string name="wifi_wps_onstart_pin_description" msgid="4206001352944024353">"Når pinkoden er indtastet, kan det tage op til to minutter at fuldføre konfigurationen."</string>
-    <string name="wifi_wps_failed_generic" msgid="8934636373182298397">"Wi-Fi-routeren kunne ikke findes"</string>
+    <string name="wifi_wps_failed_generic" msgid="8934636373182298397">"Wi-Fi-routeren blev ikke fundet"</string>
     <string name="wifi_wps_failed_wep" msgid="9158670824165143348">"Sikkerhedsindstillingen for Wi-Fi-routeren (WEP) understøttes ikke"</string>
     <string name="wifi_wps_failed_tkip" msgid="1712545345594227319">"Sikkerhedsindstillingen for Wi-Fi-routeren (TKIP) understøttes ikke"</string>
     <string name="wifi_wps_failed_overlap" msgid="3091222818050940041">"Der er en anden igangværende WPS-session. Prøv igen om et par minutter."</string>
diff --git a/Settings/res/values-de/strings.xml b/Settings/res/values-de/strings.xml
index 23cca08..484c43f 100644
--- a/Settings/res/values-de/strings.xml
+++ b/Settings/res/values-de/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"Bedienungshilfen"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"Entwickleroptionen"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"Keine"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"Nutzung &amp; Diagnose"</string>
     <string name="about_system_update" msgid="7282772247661356586">"System aktualisieren"</string>
     <string name="about_preference" msgid="4131396784531360434">"Info"</string>
     <string name="device_name" msgid="2670488158531273028">"Gerätename"</string>
diff --git a/Settings/res/values-el/strings.xml b/Settings/res/values-el/strings.xml
index 90d45f2..4326673 100644
--- a/Settings/res/values-el/strings.xml
+++ b/Settings/res/values-el/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"Προσβα/τητα"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"Επιλογές για προγραμματιστές"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"Κανένα"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"Χρήση και διαγνωστικά"</string>
     <string name="about_system_update" msgid="7282772247661356586">"Ενημέρωση συστήματος"</string>
     <string name="about_preference" msgid="4131396784531360434">"Πληροφορίες"</string>
     <string name="device_name" msgid="2670488158531273028">"Όνομα συσκευής"</string>
diff --git a/Settings/res/values-en-rAU/strings.xml b/Settings/res/values-en-rAU/strings.xml
index 5cbb59b..3882b40 100644
--- a/Settings/res/values-en-rAU/strings.xml
+++ b/Settings/res/values-en-rAU/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"Accessibility"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"Developer options"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"None"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"Usage &amp; Diagnostics"</string>
     <string name="about_system_update" msgid="7282772247661356586">"System update"</string>
     <string name="about_preference" msgid="4131396784531360434">"About"</string>
     <string name="device_name" msgid="2670488158531273028">"Device name"</string>
diff --git a/Settings/res/values-en-rGB/strings.xml b/Settings/res/values-en-rGB/strings.xml
index 5cbb59b..3882b40 100644
--- a/Settings/res/values-en-rGB/strings.xml
+++ b/Settings/res/values-en-rGB/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"Accessibility"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"Developer options"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"None"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"Usage &amp; Diagnostics"</string>
     <string name="about_system_update" msgid="7282772247661356586">"System update"</string>
     <string name="about_preference" msgid="4131396784531360434">"About"</string>
     <string name="device_name" msgid="2670488158531273028">"Device name"</string>
diff --git a/Settings/res/values-en-rIN/strings.xml b/Settings/res/values-en-rIN/strings.xml
index 5cbb59b..3882b40 100644
--- a/Settings/res/values-en-rIN/strings.xml
+++ b/Settings/res/values-en-rIN/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"Accessibility"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"Developer options"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"None"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"Usage &amp; Diagnostics"</string>
     <string name="about_system_update" msgid="7282772247661356586">"System update"</string>
     <string name="about_preference" msgid="4131396784531360434">"About"</string>
     <string name="device_name" msgid="2670488158531273028">"Device name"</string>
diff --git a/Settings/res/values-es-rUS/strings.xml b/Settings/res/values-es-rUS/strings.xml
index 9ff10c8..bb93028 100644
--- a/Settings/res/values-es-rUS/strings.xml
+++ b/Settings/res/values-es-rUS/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"Accesibilidad"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"Opciones del programador"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"Ninguno"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"Uso y diagnóstico"</string>
     <string name="about_system_update" msgid="7282772247661356586">"Actualización del sistema"</string>
     <string name="about_preference" msgid="4131396784531360434">"Acerca de"</string>
     <string name="device_name" msgid="2670488158531273028">"Nombre del dispositivo"</string>
diff --git a/Settings/res/values-es/strings.xml b/Settings/res/values-es/strings.xml
index ab4f88c..c4cd0d1 100644
--- a/Settings/res/values-es/strings.xml
+++ b/Settings/res/values-es/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"Accesibilidad"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"Opciones de desarrollo"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"Ninguno"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"Uso y diagnósticos"</string>
     <string name="about_system_update" msgid="7282772247661356586">"Actualización del sistema"</string>
     <string name="about_preference" msgid="4131396784531360434">"Información"</string>
     <string name="device_name" msgid="2670488158531273028">"Nombre del dispositivo"</string>
diff --git a/Settings/res/values-et-rEE/strings.xml b/Settings/res/values-et-rEE/strings.xml
index 5fb0037..0709412 100644
--- a/Settings/res/values-et-rEE/strings.xml
+++ b/Settings/res/values-et-rEE/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"Juurdepääsu seaded"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"Arendaja valikud"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"Puudub"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"Kasutus ja diagnostika"</string>
     <string name="about_system_update" msgid="7282772247661356586">"Süsteemivärskendus"</string>
     <string name="about_preference" msgid="4131396784531360434">"Teave"</string>
     <string name="device_name" msgid="2670488158531273028">"Seadme nimi"</string>
diff --git a/Settings/res/values-eu-rES/strings.xml b/Settings/res/values-eu-rES/strings.xml
index af7091b..0825a93 100644
--- a/Settings/res/values-eu-rES/strings.xml
+++ b/Settings/res/values-eu-rES/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"Erabilerraztasuna"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"Garatzaileen aukerak"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"Bat ere ez"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"Erabilera eta diagnostikoak"</string>
     <string name="about_system_update" msgid="7282772247661356586">"Sistemaren eguneratzea"</string>
     <string name="about_preference" msgid="4131396784531360434">"Honi buruz"</string>
     <string name="device_name" msgid="2670488158531273028">"Gailuaren izena"</string>
diff --git a/Settings/res/values-fa/strings.xml b/Settings/res/values-fa/strings.xml
index f742ead..ebd40d7 100644
--- a/Settings/res/values-fa/strings.xml
+++ b/Settings/res/values-fa/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"قابلیت دسترسی"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"گزینه‌های برنامه‌نویسان"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"هیچ‌‌کدام"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"میزان استفاده و عیب‌یابی"</string>
     <string name="about_system_update" msgid="7282772247661356586">"به‌روزرسانی سیستم"</string>
     <string name="about_preference" msgid="4131396784531360434">"درباره"</string>
     <string name="device_name" msgid="2670488158531273028">"نام دستگاه"</string>
@@ -174,7 +175,7 @@
     <string name="wifi_action_change_network" msgid="5196215981075986148">"تغییر داده شود"</string>
     <string name="wifi_action_dont_change_network" msgid="1449920958930251977">"تغییر داده نشود"</string>
     <string name="wifi_action_advanced_yes" msgid="8586473568311558982">"تأیید"</string>
-    <string name="wifi_action_advanced_no" msgid="8165601242122651326">"خیر (توصیه می‌شود)"</string>
+    <string name="wifi_action_advanced_no" msgid="8165601242122651326">"نه (توصیه می‌شود)"</string>
     <string name="wifi_action_proxy_none" msgid="4457231399674182650">"هیچ‌کدام"</string>
     <string name="wifi_action_proxy_manual" msgid="8402002777441261064">"دستی"</string>
     <string name="wifi_action_dhcp" msgid="6338911832360962268">"DHCP"</string>
diff --git a/Settings/res/values-fi/strings.xml b/Settings/res/values-fi/strings.xml
index 35c3ab6..86280a5 100644
--- a/Settings/res/values-fi/strings.xml
+++ b/Settings/res/values-fi/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"Esteettömyys"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"Kehittäjäasetukset"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"Ei mitään"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"Käyttö- ja diagnostiikkatiedot"</string>
     <string name="about_system_update" msgid="7282772247661356586">"Järjestelmäpäivitys"</string>
     <string name="about_preference" msgid="4131396784531360434">"Tietoja"</string>
     <string name="device_name" msgid="2670488158531273028">"Laitteen nimi"</string>
diff --git a/Settings/res/values-fr-rCA/strings.xml b/Settings/res/values-fr-rCA/strings.xml
index b9250ad..0cf6281 100644
--- a/Settings/res/values-fr-rCA/strings.xml
+++ b/Settings/res/values-fr-rCA/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"Accessibilité"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"Options pour les développeurs"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"Aucun"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"Utilisation et diagnostics"</string>
     <string name="about_system_update" msgid="7282772247661356586">"Mise à jour du système"</string>
     <string name="about_preference" msgid="4131396784531360434">"À propos"</string>
     <string name="device_name" msgid="2670488158531273028">"Nom de l\'appareil"</string>
diff --git a/Settings/res/values-fr/strings.xml b/Settings/res/values-fr/strings.xml
index 1bcfca8..acbeb1e 100644
--- a/Settings/res/values-fr/strings.xml
+++ b/Settings/res/values-fr/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"Accessibilité"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"Options pour les développeurs"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"Aucune"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"Utilisation et diagnostics"</string>
     <string name="about_system_update" msgid="7282772247661356586">"Mise à jour du système"</string>
     <string name="about_preference" msgid="4131396784531360434">"À propos"</string>
     <string name="device_name" msgid="2670488158531273028">"Nom de l\'appareil"</string>
diff --git a/Settings/res/values-gl-rES/strings.xml b/Settings/res/values-gl-rES/strings.xml
index 549581a..3e0bc83 100644
--- a/Settings/res/values-gl-rES/strings.xml
+++ b/Settings/res/values-gl-rES/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"Accesibilidade"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"Opcións de programador"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"Ningunha"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"Uso e diagnóstico"</string>
     <string name="about_system_update" msgid="7282772247661356586">"Actualización do sistema"</string>
     <string name="about_preference" msgid="4131396784531360434">"Acerca de"</string>
     <string name="device_name" msgid="2670488158531273028">"Nome do dispositivo"</string>
diff --git a/Settings/res/values-gu-rIN/strings.xml b/Settings/res/values-gu-rIN/strings.xml
index fe869e8..e596579 100644
--- a/Settings/res/values-gu-rIN/strings.xml
+++ b/Settings/res/values-gu-rIN/strings.xml
@@ -177,6 +177,8 @@
     <skip />
     <!-- no translation found for accessibility_none (3441648940134070004) -->
     <skip />
+    <!-- no translation found for system_diagnostic (7269638365915225701) -->
+    <skip />
     <!-- no translation found for about_system_update (7282772247661356586) -->
     <skip />
     <!-- no translation found for about_preference (4131396784531360434) -->
diff --git a/Settings/res/values-hi/strings.xml b/Settings/res/values-hi/strings.xml
index 8159a9c..fb3e634 100644
--- a/Settings/res/values-hi/strings.xml
+++ b/Settings/res/values-hi/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"सरल उपयोग"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"डेवलपर विकल्प"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"कोई नहीं"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"उपयोग और निदान"</string>
     <string name="about_system_update" msgid="7282772247661356586">"सिस्‍टम अपडेट"</string>
     <string name="about_preference" msgid="4131396784531360434">"संक्षिप्त विवरण"</string>
     <string name="device_name" msgid="2670488158531273028">"डिवाइस नाम"</string>
diff --git a/Settings/res/values-hr/strings.xml b/Settings/res/values-hr/strings.xml
index c15711a..67c634d 100644
--- a/Settings/res/values-hr/strings.xml
+++ b/Settings/res/values-hr/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"Pristupačnost"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"Opcije za razvojne programere"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"Ništa"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"Upotreba i dijagnostika"</string>
     <string name="about_system_update" msgid="7282772247661356586">"Ažuriranje sustava"</string>
     <string name="about_preference" msgid="4131396784531360434">"O usluzi"</string>
     <string name="device_name" msgid="2670488158531273028">"Naziv uređaja"</string>
diff --git a/Settings/res/values-hu/strings.xml b/Settings/res/values-hu/strings.xml
index 14ac949..85d9d8c 100644
--- a/Settings/res/values-hu/strings.xml
+++ b/Settings/res/values-hu/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"Kisegítő lehetőségek"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"Fejlesztői beállítások"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"Nincs"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"Használat és diagnosztika"</string>
     <string name="about_system_update" msgid="7282772247661356586">"Rendszerfrissítés"</string>
     <string name="about_preference" msgid="4131396784531360434">"Névjegy"</string>
     <string name="device_name" msgid="2670488158531273028">"Eszköz neve"</string>
diff --git a/Settings/res/values-hy-rAM/strings.xml b/Settings/res/values-hy-rAM/strings.xml
index 9dc1a50..74a7d7e 100644
--- a/Settings/res/values-hy-rAM/strings.xml
+++ b/Settings/res/values-hy-rAM/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"Մատչելիություն"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"Մշակողի ընտրանքներ"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"Չկա"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"Օգտագործման և ախտորոշման տվյալներ"</string>
     <string name="about_system_update" msgid="7282772247661356586">"Համակարգային թարմացում"</string>
     <string name="about_preference" msgid="4131396784531360434">"Սարքի մասին"</string>
     <string name="device_name" msgid="2670488158531273028">"Սարքի անունը"</string>
diff --git a/Settings/res/values-in/strings.xml b/Settings/res/values-in/strings.xml
index bb4e1c0..ef927e8 100644
--- a/Settings/res/values-in/strings.xml
+++ b/Settings/res/values-in/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"Aksesibilitas"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"Opsi pengembang"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"Tidak ada"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"Penggunaan &amp; Diagnostik"</string>
     <string name="about_system_update" msgid="7282772247661356586">"Pembaruan sistem"</string>
     <string name="about_preference" msgid="4131396784531360434">"Tentang"</string>
     <string name="device_name" msgid="2670488158531273028">"Nama perangkat"</string>
diff --git a/Settings/res/values-is-rIS/strings.xml b/Settings/res/values-is-rIS/strings.xml
index aab88f4..1de625b 100644
--- a/Settings/res/values-is-rIS/strings.xml
+++ b/Settings/res/values-is-rIS/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"Aðgengi"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"Forritunarkostir"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"Ekkert"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"Notkun og greining"</string>
     <string name="about_system_update" msgid="7282772247661356586">"Kerfisuppfærsla"</string>
     <string name="about_preference" msgid="4131396784531360434">"Um"</string>
     <string name="device_name" msgid="2670488158531273028">"Heiti tækis"</string>
diff --git a/Settings/res/values-it/strings.xml b/Settings/res/values-it/strings.xml
index e27c68e..72dd50d 100644
--- a/Settings/res/values-it/strings.xml
+++ b/Settings/res/values-it/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"Accessibilità"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"Opzioni sviluppatore"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"Nessuna"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"Utilizzo e diagnostica"</string>
     <string name="about_system_update" msgid="7282772247661356586">"Aggiornamento di sistema"</string>
     <string name="about_preference" msgid="4131396784531360434">"Informazioni"</string>
     <string name="device_name" msgid="2670488158531273028">"Nome dispositivo"</string>
diff --git a/Settings/res/values-iw/strings.xml b/Settings/res/values-iw/strings.xml
index 0594e1f..44262d5 100644
--- a/Settings/res/values-iw/strings.xml
+++ b/Settings/res/values-iw/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"נגישות"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"אפשרויות מפתח"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"ללא"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"שימוש ואבחון"</string>
     <string name="about_system_update" msgid="7282772247661356586">"עדכון מערכת"</string>
     <string name="about_preference" msgid="4131396784531360434">"מידע כללי"</string>
     <string name="device_name" msgid="2670488158531273028">"שם המכשיר"</string>
diff --git a/Settings/res/values-ja/strings.xml b/Settings/res/values-ja/strings.xml
index 50e2458..8ff0194 100644
--- a/Settings/res/values-ja/strings.xml
+++ b/Settings/res/values-ja/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"ユーザー補助"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"開発者向けオプション"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"なし"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"使用状況と診断"</string>
     <string name="about_system_update" msgid="7282772247661356586">"システムアップデート"</string>
     <string name="about_preference" msgid="4131396784531360434">"端末情報"</string>
     <string name="device_name" msgid="2670488158531273028">"端末名"</string>
diff --git a/Settings/res/values-ka-rGE/strings.xml b/Settings/res/values-ka-rGE/strings.xml
index 48c9069..0efe3a2 100644
--- a/Settings/res/values-ka-rGE/strings.xml
+++ b/Settings/res/values-ka-rGE/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"მარტივი წვდომა"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"პარამეტრები დეველოპერებისთვის"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"არცერთი"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"გამოყენების და დიაგნოსტიკური მონაცემები"</string>
     <string name="about_system_update" msgid="7282772247661356586">"სისტემის განახლება"</string>
     <string name="about_preference" msgid="4131396784531360434">"შესახებ"</string>
     <string name="device_name" msgid="2670488158531273028">"მოწყობილობის სახელი"</string>
diff --git a/Settings/res/values-kk-rKZ/strings.xml b/Settings/res/values-kk-rKZ/strings.xml
index 8c6eaa0..f8f76c7 100644
--- a/Settings/res/values-kk-rKZ/strings.xml
+++ b/Settings/res/values-kk-rKZ/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"Арнайы мүмкіндіктер"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"Әзірлеуші опциялары"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"Ешқандай"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"Пайдалану және диагностика"</string>
     <string name="about_system_update" msgid="7282772247661356586">"Жүйе жаңартуы"</string>
     <string name="about_preference" msgid="4131396784531360434">"Туралы"</string>
     <string name="device_name" msgid="2670488158531273028">"Құрылғы атауы"</string>
diff --git a/Settings/res/values-km-rKH/strings.xml b/Settings/res/values-km-rKH/strings.xml
index abc16fb..1e3d9e8 100644
--- a/Settings/res/values-km-rKH/strings.xml
+++ b/Settings/res/values-km-rKH/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"ភាព​ងាយស្រួល"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"ជម្រើស​អ្នក​អភិវឌ្ឍ"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"គ្មាន"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"ការប្រើប្រាស់ &amp; ការវិនិច្ឆ័យ"</string>
     <string name="about_system_update" msgid="7282772247661356586">"ធ្វើ​បច្ចុប្បន្នភាព​ប្រព័ន្ធ​"</string>
     <string name="about_preference" msgid="4131396784531360434">"អំពី"</string>
     <string name="device_name" msgid="2670488158531273028">"ឈ្មោះ​ឧបករណ៍"</string>
diff --git a/Settings/res/values-kn-rIN/strings.xml b/Settings/res/values-kn-rIN/strings.xml
index 3c50795..9863b96 100644
--- a/Settings/res/values-kn-rIN/strings.xml
+++ b/Settings/res/values-kn-rIN/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"ಪ್ರವೇಶಿಸುವಿಕೆ"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"ಡೆವಲಪರ್ ಆಯ್ಕೆಗಳು"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"ಯಾವುದೂ ಇಲ್ಲ"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"ಬಳಕೆ ಮತ್ತು ಡಯಾಗ್ನೋಸ್ಟಿಕ್‌ಗಳು"</string>
     <string name="about_system_update" msgid="7282772247661356586">"ಸಿಸ್ಟಂ ಅಪ್‌ಡೇಟ್‌‌"</string>
     <string name="about_preference" msgid="4131396784531360434">"ಕುರಿತು"</string>
     <string name="device_name" msgid="2670488158531273028">"ಸಾಧನದ ಹೆಸರು"</string>
diff --git a/Settings/res/values-ko/strings.xml b/Settings/res/values-ko/strings.xml
index 425b11e..11a279e 100644
--- a/Settings/res/values-ko/strings.xml
+++ b/Settings/res/values-ko/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"접근성"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"개발자 옵션"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"없음"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"사용 및 진단"</string>
     <string name="about_system_update" msgid="7282772247661356586">"시스템 업데이트"</string>
     <string name="about_preference" msgid="4131396784531360434">"정보"</string>
     <string name="device_name" msgid="2670488158531273028">"기기 이름"</string>
diff --git a/Settings/res/values-ky-rKG/strings.xml b/Settings/res/values-ky-rKG/strings.xml
index 06fe72c..6c9c91f 100644
--- a/Settings/res/values-ky-rKG/strings.xml
+++ b/Settings/res/values-ky-rKG/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"Өзгөчө мүмкүнчүлүктөр"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"Иштеп чыгуучунун параметрлери"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"Эч бири"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"Колдонуу жана мүчүлүштүктөрдү аныктоо"</string>
     <string name="about_system_update" msgid="7282772247661356586">"Тутум жаңыртуусу"</string>
     <string name="about_preference" msgid="4131396784531360434">"Жөнүндө"</string>
     <string name="device_name" msgid="2670488158531273028">"Түзмөктүн аталышы"</string>
diff --git a/Settings/res/values-lo-rLA/strings.xml b/Settings/res/values-lo-rLA/strings.xml
index 244abf0..c0e180e 100644
--- a/Settings/res/values-lo-rLA/strings.xml
+++ b/Settings/res/values-lo-rLA/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"ການຊ່ວຍເຂົ້າເຖິງ"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"ໂຕເລືອກ​ນັກພັດທະນາ"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"ບໍ່ມີ"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"ການ​ນຳ​ໃຊ້  ແລະ ​ການ​ວິ​ເຄາະ​ບັນ​ຫາ"</string>
     <string name="about_system_update" msgid="7282772247661356586">"ການອັບເດດລະບົບ"</string>
     <string name="about_preference" msgid="4131396784531360434">"ກ່ຽວກັບ"</string>
     <string name="device_name" msgid="2670488158531273028">"ຊື່​ອຸ​ປະ​ກອນ"</string>
diff --git a/Settings/res/values-lt/strings.xml b/Settings/res/values-lt/strings.xml
index 3282f7d..0fde0ac 100644
--- a/Settings/res/values-lt/strings.xml
+++ b/Settings/res/values-lt/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"Pritaikymas neįgaliesiems"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"Kūrėjo parinktys"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"Nėra"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"Naudojimas ir diagnostika"</string>
     <string name="about_system_update" msgid="7282772247661356586">"Sistemos naujinys"</string>
     <string name="about_preference" msgid="4131396784531360434">"Apie"</string>
     <string name="device_name" msgid="2670488158531273028">"Įrenginio pavadinimas"</string>
diff --git a/Settings/res/values-lv/strings.xml b/Settings/res/values-lv/strings.xml
index 9da40c7..65b74b2 100644
--- a/Settings/res/values-lv/strings.xml
+++ b/Settings/res/values-lv/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"Pieejamība"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"Izstrādātājiem paredzētās opcijas"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"Nav"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"Lietojums un diagnostika"</string>
     <string name="about_system_update" msgid="7282772247661356586">"Sistēmas atjauninājums"</string>
     <string name="about_preference" msgid="4131396784531360434">"Par"</string>
     <string name="device_name" msgid="2670488158531273028">"Ierīces nosaukums"</string>
diff --git a/Settings/res/values-mk-rMK/strings.xml b/Settings/res/values-mk-rMK/strings.xml
index dbf5c9a..de9fb7d 100644
--- a/Settings/res/values-mk-rMK/strings.xml
+++ b/Settings/res/values-mk-rMK/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"Пристапност"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"Опции на програмер"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"Ништо"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"Употреба и дијагностика"</string>
     <string name="about_system_update" msgid="7282772247661356586">"Ажурирање на системот"</string>
     <string name="about_preference" msgid="4131396784531360434">"За"</string>
     <string name="device_name" msgid="2670488158531273028">"Име на уред"</string>
diff --git a/Settings/res/values-ml-rIN/strings.xml b/Settings/res/values-ml-rIN/strings.xml
index f9c6106..0dbd9c0 100644
--- a/Settings/res/values-ml-rIN/strings.xml
+++ b/Settings/res/values-ml-rIN/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"പ്രവേശനക്ഷമത"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"ഡവലപ്പർ ഓ‌പ്ഷനുകൾ"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"ഒന്നുമില്ല"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"ഉപയോഗവും പ്രശ്നനിർണ്ണയവും"</string>
     <string name="about_system_update" msgid="7282772247661356586">"സിസ്റ്റം അപ്ഡേറ്റ്"</string>
     <string name="about_preference" msgid="4131396784531360434">"ആമുഖം"</string>
     <string name="device_name" msgid="2670488158531273028">"ഉപകരണത്തിന്റെ പേര്"</string>
diff --git a/Settings/res/values-mn-rMN/strings.xml b/Settings/res/values-mn-rMN/strings.xml
index d20e183..edd2126 100644
--- a/Settings/res/values-mn-rMN/strings.xml
+++ b/Settings/res/values-mn-rMN/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"Хандалт"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"Хөгжүүлэгчийн тохиргоо"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"Хоосон"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"Хэрэглээ, оношлогоо"</string>
     <string name="about_system_update" msgid="7282772247661356586">"Системийн шинэчлэлт"</string>
     <string name="about_preference" msgid="4131396784531360434">"Тухай"</string>
     <string name="device_name" msgid="2670488158531273028">"Төхөөрөмжийн нэр"</string>
diff --git a/Settings/res/values-mr-rIN/strings.xml b/Settings/res/values-mr-rIN/strings.xml
index 8d0c8c1..4e94355 100644
--- a/Settings/res/values-mr-rIN/strings.xml
+++ b/Settings/res/values-mr-rIN/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"प्रवेशयोग्यता"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"विकासक पर्याय"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"कोणतेही नाही"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"वापर आणि निदान"</string>
     <string name="about_system_update" msgid="7282772247661356586">"सिस्टम अद्यतन"</string>
     <string name="about_preference" msgid="4131396784531360434">"विषयी"</string>
     <string name="device_name" msgid="2670488158531273028">"डिव्हाइस नाव"</string>
diff --git a/Settings/res/values-ms-rMY/strings.xml b/Settings/res/values-ms-rMY/strings.xml
index bd4d797..b4e8834 100644
--- a/Settings/res/values-ms-rMY/strings.xml
+++ b/Settings/res/values-ms-rMY/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"Kebolehaksesan"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"Pilihan pemaju"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"Tiada"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"Penggunaan &amp; Diagnostik"</string>
     <string name="about_system_update" msgid="7282772247661356586">"Kemas kini sistem"</string>
     <string name="about_preference" msgid="4131396784531360434">"Perihal"</string>
     <string name="device_name" msgid="2670488158531273028">"Nama peranti"</string>
diff --git a/Settings/res/values-my-rMM/strings.xml b/Settings/res/values-my-rMM/strings.xml
index 187d291..7f135cd 100644
--- a/Settings/res/values-my-rMM/strings.xml
+++ b/Settings/res/values-my-rMM/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"ရယူသုံးနိုင်မှု"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"ပြုစုပေးခဲ့သူ အတွက် ရွေးစရာများ"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"မရှိ"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"သုံးစွဲမှု &amp; ပြဿနာရှာဖွေမှု"</string>
     <string name="about_system_update" msgid="7282772247661356586">"စနစ် မွမ်းမံမှု"</string>
     <string name="about_preference" msgid="4131396784531360434">"အကြောင်း"</string>
     <string name="device_name" msgid="2670488158531273028">"ကိရိယာ အမည်"</string>
diff --git a/Settings/res/values-nb/strings.xml b/Settings/res/values-nb/strings.xml
index 8961766..fd31bce 100644
--- a/Settings/res/values-nb/strings.xml
+++ b/Settings/res/values-nb/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"Tilgjengelighet"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"Utvikleralternativer"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"Ingen"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"Bruk og diagnostikk"</string>
     <string name="about_system_update" msgid="7282772247661356586">"Systemoppdatering"</string>
     <string name="about_preference" msgid="4131396784531360434">"Info"</string>
     <string name="device_name" msgid="2670488158531273028">"Enhetsnavn"</string>
diff --git a/Settings/res/values-ne-rNP/strings.xml b/Settings/res/values-ne-rNP/strings.xml
index f37e6c9..b20701c 100644
--- a/Settings/res/values-ne-rNP/strings.xml
+++ b/Settings/res/values-ne-rNP/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"पहुँच"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"विकासकर्ता विकल्पहरू"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"कुनै पनि होइन"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"उपयोग र निदान"</string>
     <string name="about_system_update" msgid="7282772247661356586">"प्रणाली अद्यावधिक"</string>
     <string name="about_preference" msgid="4131396784531360434">"बारेमा"</string>
     <string name="device_name" msgid="2670488158531273028">"उपकरण नाम"</string>
@@ -114,7 +115,7 @@
       <item quantity="one">तपाईँ अहिले एउटा विकासकर्ता हुनबाट <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> कदम टाढा हुनुहुन्छ</item>
     </plurals>
     <string name="about_ads" msgid="3364786994943748337">"विज्ञापनहरू"</string>
-    <string name="show_dev_on" msgid="8997172736024819952">"तपाईं अब एउटा विकासकर्ता हुनुहुन्छ!"</string>
+    <string name="show_dev_on" msgid="8997172736024819952">"तपाईँ अब एउटा विकासकर्ता हुनुहुन्छ!"</string>
     <string name="show_dev_already" msgid="7525967300421794483">"आवश्यकता छैन, तपाईँ पहिल्यै एउटा विकासकर्ता हुनुहुन्छ"</string>
   <string-array name="wifi_signal_strength">
     <item msgid="6926038943588801452">"कमजोर"</item>
@@ -235,7 +236,7 @@
     <string name="storage_wizard_format_as_private_title" msgid="1433086533563409114">"आन्तरिक भण्डारणको रुपमा फर्म्याट गर्नुहोस्"</string>
     <string name="storage_wizard_format_as_private_description" msgid="5814513630861655168">"यो यसलाई सुरक्षित बनाउन USB ड्राइभ फर्म्याट गर्न आवश्यक छ। सुरक्षित तरिकाले फर्म्याट गरेपछि मात्र यो ड्राइभले यस यन्त्रसँग काम गर्छ। फर्म्याट गर्दा ड्राइभमा हाल भण्डारण गरिएका सबै डेटा मेटाउँछ। डेटा हराउनेबाट जोगिन, यसलाई ब्याक अप गर्ने विचार गर्नुहोस्।"</string>
     <string name="storage_wizard_format_as_public_title" msgid="977475385015522171">"मेट्नुहोस् र फर्म्याट गर्नुहोस्"</string>
-    <string name="storage_wizard_format_as_public_description" msgid="8591201523650249337">"फर्म्याट गरेपछि, तपाईं यो USB ड्राइभ अन्य यन्त्रहरूमा प्रयोग गर्न सक्नुहुन्छ। सबै डेटा मेटिनेछन्। पहिला अनुप्रयोगहरू अन्य भण्डारणमा सारेर ब्याक अप गर्ने विचार गर्नुहोस्।"</string>
+    <string name="storage_wizard_format_as_public_description" msgid="8591201523650249337">"फर्म्याट गरेपछि, तपाईँ यो USB ड्राइभ अन्य यन्त्रहरूमा प्रयोग गर्न सक्नुहुन्छ। सबै डेटा मेटिनेछन्। पहिला अनुप्रयोगहरू अन्य भण्डारणमा सारेर ब्याक अप गर्ने विचार गर्नुहोस्।"</string>
     <string name="storage_wizard_format_progress_title" msgid="143911640282435570">"USB ड्राइभ फर्म्याट गरिँदै..."</string>
     <string name="storage_wizard_format_progress_description" msgid="5320980721352781920">"यसलाई एक क्षण लाग्न सक्छ। कृपया ड्राइभ नहटाउनुहोस्।"</string>
     <string name="storage_wizard_migrate_confirm_title" msgid="369820166257265495">"डेटा <xliff:g id="NAME">%1$s</xliff:g> मा सार्नुहोस्"</string>
@@ -247,7 +248,7 @@
     <string name="storage_wizard_migrate_progress_title" msgid="8063255124619498728">"डेटा <xliff:g id="NAME">%1$s</xliff:g> मा सार्दै..."</string>
     <string name="storage_wizard_migrate_progress_description" msgid="3337889465416363170">"यसलाई एक क्षण लाग्‍न सक्छ। कृपया ड्राइभ नहटाउनुहोस्।\nकेही अनुप्रयोगहरू स्थानान्तरण गर्ने समयमा ठीक सँग काम नगर्न सक्छ।"</string>
     <string name="storage_wizard_format_slow_title" msgid="2483634437996887661">"यो ड्राइभ सुस्त देखिन्छ।"</string>
-    <string name="storage_wizard_format_slow_summary" msgid="1949177940762639885">"तपाईं जारी राख्न सक्नुहुन्छ, तर यस स्थानमा सारिएका अनुप्रयोगहरू अड्किन सक्छ र डेटा स्थानान्तरणले लामो समय लिन सक्छ। राम्रो कार्यसम्पादनको लागि थप छिटो ड्राइभको प्रयोग गर्ने विचार गर्नुहोस्।"</string>
+    <string name="storage_wizard_format_slow_summary" msgid="1949177940762639885">"तपाईँ जारी राख्न सक्नुहुन्छ, तर यस स्थानमा सारिएका अनुप्रयोगहरू अड्किन सक्छ र डेटा स्थानान्तरणले लामो समय लिन सक्छ। राम्रो कार्यसम्पादनको लागि थप छिटो ड्राइभको प्रयोग गर्ने विचार गर्नुहोस्।"</string>
     <string name="storage_wizard_format_action" msgid="3986485572528374905">"फर्म्याट गर्नुहोस्"</string>
     <string name="storage_wizard_backup_apps_action" msgid="7246092320517630760">"अनुप्रयोगहरू ब्याक अप गर्नुहोस्"</string>
     <string name="storage_wizard_back_up_apps_title" msgid="452805102278225533">"अनुप्रयोगहरु <xliff:g id="NAME">%1$s</xliff:g> मा भण्डारण गरियो"</string>
@@ -314,7 +315,7 @@
     <string name="location_reporting_desc" msgid="6256424995139430823">"Google ले उत्पादनहरूमा यो सुविधा प्रयोग गर्दछ जस्तै Google Now र Google Maps । स्थान रिपोर्टिङ खोल्दै यो सुविधा स्टोर प्रयोग गर्ने तपाईंको  Google  खाता सन्दर्भमा आफ्नो उपकरणको सबै भन्दा भर्खरैको स्थान डेटा प्रयोग गर्ने कुनै पनि Google उत्पादनले दिन्छ।"</string>
     <string name="location_history_desc" msgid="3861249867748294369">"स्थान इतिहास यो खाताको लागि बन्द हुँदा Google ले तपाईंको अनुप्रयोगहरूद्वारा प्रयोगको लागि तपाईँको उपकरणको स्थान डेटा भण्डारण गर्न सक्छ। \n\n उदाहरणका लागि, Google Maps ले तपाईँलाई निर्देशन दिन सक्छ, र Google Now ले तपाईँलाई कम्युट ट्राफिकको बारेमा सूचित गर्न सक्छ। \n\n तपाईँ कुनै पनि समयमा स्थान इतिहास बन्द गर्न सक्नुहुन्छ, तर यसले कार्य गर्दछ त्यसैले यसलाई मेट्नु हुँदैन।आफ्नो स्थान इतिहास हेर्न र  व्यवस्थित गर्न, maps.google.com/locationhistory को भ्रमण गर्नुहोस्।"</string>
     <string name="delete_location_history_title" msgid="5804802702252280549">"स्थान इतिहास मेटाउनुहोस्"</string>
-    <string name="delete_location_history_desc" msgid="4142806827237093397">"यसले यो Google खाताको लागि स्टोर भएको सबै स्थान इतिहास यो उपकरणबाट मेटाउने छ। तपाईं यो मेटाउने प्रकृया पूर्ववत गर्न सक्नुहुन्न। Google Now सहित केही अनुप्रयोगहरूले, कार्य गर्न बन्द गर्ने छ।"</string>
+    <string name="delete_location_history_desc" msgid="4142806827237093397">"यसले यो Google खाताको लागि स्टोर भएको सबै स्थान इतिहास यो उपकरणबाट मेटाउने छ। तपाईँ यो मेटाउने प्रकृया पूर्ववत गर्न सक्नुहुन्न। Google Now सहित केही अनुप्रयोगहरूले, कार्य गर्न बन्द गर्ने छ।"</string>
     <string name="system_services" msgid="7230571820151215779">"सेवाहरू"</string>
     <string name="accessibility_service_settings" msgid="322888335240595695">"सेवा सेटिङ्हरू"</string>
     <string name="accessibility_captions" msgid="6133896463407851079">"क्याप्सन"</string>
@@ -421,7 +422,7 @@
     <string name="disagree" msgid="9170636026862400981">"असहमत"</string>
     <string name="security_unknown_sources_title" msgid="769762478057744545">"अज्ञात स्रोतहरू"</string>
     <string name="security_unknown_sources_desc" msgid="7197053279914817124">"Play स्टोर भन्दा अन्य स्रोतहरूबाट अनुप्रयोगहरूको स्थापनालाई अनुमति दिनुहोस्"</string>
-    <string name="security_unknown_sources_confirm_desc" msgid="7167350583097191925">"तपाईंको उपकरण र व्यक्तिगत डेटा अज्ञात स्रोतको अनुप्रयोगहरूद्वारा आक्रमण गर्न बढि असुरक्षित छन्। तपाईंको उपकरणमा वा यी अनुप्रयोगहरू प्रयोगबाट डेटा हराउन परिणाम वा कुनै पनि नोक्सानीका लागि तपाईं आफैं जिम्मेदार हुनुहुन्छ भन्ने कुरामा सहमत हुनुहुन्छ।"</string>
+    <string name="security_unknown_sources_confirm_desc" msgid="7167350583097191925">"तपाईँको उपकरण र व्यक्तिगत डेटा अज्ञात स्रोतको अनुप्रयोगहरूद्वारा आक्रमण गर्न बढि असुरक्षित छन्। तपाईँको उपकरणमा वा यी अनुप्रयोगहरू प्रयोगबाट डेटा हराउन परिणाम वा कुनै पनि नोक्सानीका लागि तपाईँ आफैं जिम्मेदार हुनुहुन्छ भन्ने कुरामा सहमत हुनुहुन्छ।"</string>
     <string name="security_verify_apps_title" msgid="5787946958632254988">"अनुप्रयोगहरू रुजु गर्नुहोस्"</string>
     <string name="security_verify_apps_desc" msgid="1456317893117818733">"हानी गर्न सक्ने अनुप्रयोगहरूका स्थापना गर्नुअघि चेतावनी दिनुहोस् वा अनुमति नै नदिनुहोस्"</string>
     <string name="system_hdcp_checking_never" msgid="1758043078676276985">"कहिले पनि होइन"</string>
@@ -539,13 +540,13 @@
     <string name="device_apps_app_management_force_stop" msgid="9195433885986760867">"दबाब रोक्नुहोस्"</string>
     <string name="device_apps_app_management_force_stop_desc" msgid="3616902338964109665">"तपाईंले अनुप्रयोग बन्द गर्न बल गर्नुभयो भने, यसले चाहेअनुसार काम नगर्न सक्छ।"</string>
     <string name="device_apps_app_management_uninstall" msgid="531427430753359746">"स्थापना हटाउनुहोस्"</string>
-    <string name="device_apps_app_management_uninstall_desc" msgid="1104982472633576960">"तपाईं यो अनुप्रयोग स्थापना रद्द गर्न चाहनुहुन्छ?"</string>
+    <string name="device_apps_app_management_uninstall_desc" msgid="1104982472633576960">"तपाईँ यो अनुप्रयोग स्थापना रद्द गर्न चाहनुहुन्छ?"</string>
     <string name="device_apps_app_management_uninstall_updates" msgid="5151008748970915803">"अद्यावधिकहरूको स्थापना रद्द गर्नुहोस्"</string>
     <string name="device_apps_app_management_uninstall_updates_desc" msgid="9165160845303755321">"यस Android प्रणाली अनुप्रयोगमा भएका सम्पूर्ण अद्यावधिकहरूको स्थापना हटाइनेछ।"</string>
     <string name="device_apps_app_management_disable" msgid="6136528600052941589">"अक्षम गर्नुहोस्"</string>
-    <string name="device_apps_app_management_disable_desc" msgid="1295507373252301108">"तपाईं यो अनुप्रयोग अक्षम गर्न चाहनुहुन्छ?"</string>
+    <string name="device_apps_app_management_disable_desc" msgid="1295507373252301108">"तपाईँ यो अनुप्रयोग अक्षम गर्न चाहनुहुन्छ?"</string>
     <string name="device_apps_app_management_enable" msgid="3246823119203444608">"सक्षम गर्नुहोस्"</string>
-    <string name="device_apps_app_management_enable_desc" msgid="7490219375247065314">"तपाईं यो अनुप्रयोग सक्षम गर्न चाहनुहुन्छ?"</string>
+    <string name="device_apps_app_management_enable_desc" msgid="7490219375247065314">"तपाईँ यो अनुप्रयोग सक्षम गर्न चाहनुहुन्छ?"</string>
     <string name="device_apps_app_management_storage_used" msgid="4611351576179140634">"प्रयोग भएको भण्डारण"</string>
     <string name="device_apps_app_management_storage_used_desc" msgid="1529188874944834661">"<xliff:g id="VOLUME">%2$s</xliff:g> मा प्रयोग <xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="device_apps_app_management_clear_data" msgid="4439114679323274127">"डाटा खाली गर्नुहोस्"</string>
diff --git a/Settings/res/values-nl/strings.xml b/Settings/res/values-nl/strings.xml
index 36777df..056c9a2 100644
--- a/Settings/res/values-nl/strings.xml
+++ b/Settings/res/values-nl/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"Toegankelijkheid"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"Opties voor ontwikkelaars"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"Geen"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"Gebruik en diagnostische gegevens"</string>
     <string name="about_system_update" msgid="7282772247661356586">"Systeemupdate"</string>
     <string name="about_preference" msgid="4131396784531360434">"Over"</string>
     <string name="device_name" msgid="2670488158531273028">"Apparaatnaam"</string>
diff --git a/Settings/res/values-pa-rIN/strings.xml b/Settings/res/values-pa-rIN/strings.xml
index 74ed2b8..2d7193c 100644
--- a/Settings/res/values-pa-rIN/strings.xml
+++ b/Settings/res/values-pa-rIN/strings.xml
@@ -177,6 +177,8 @@
     <skip />
     <!-- no translation found for accessibility_none (3441648940134070004) -->
     <skip />
+    <!-- no translation found for system_diagnostic (7269638365915225701) -->
+    <skip />
     <!-- no translation found for about_system_update (7282772247661356586) -->
     <skip />
     <!-- no translation found for about_preference (4131396784531360434) -->
diff --git a/Settings/res/values-pl/strings.xml b/Settings/res/values-pl/strings.xml
index ffaa8b6..6ff875b 100644
--- a/Settings/res/values-pl/strings.xml
+++ b/Settings/res/values-pl/strings.xml
@@ -83,7 +83,7 @@
     <string name="bluetooth_enter_pin_msg" msgid="7443458826667686394">"Aby sparować z urządzeniem &lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;, &lt;br&gt;wpisz wymagany dla niego PIN:"</string>
     <string name="bluetooth_enter_passkey_msg" msgid="7980787196089653577">"Aby sparować z urządzeniem &lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;, &lt;br&gt;wpisz wymagane dla niego hasło."</string>
     <string name="bluetooth_pin_values_hint" msgid="2319900367581543300">"Zazwyczaj 0000 lub 1234"</string>
-    <string name="bluetooth_pair" msgid="7836818609620478122">"Paruj"</string>
+    <string name="bluetooth_pair" msgid="7836818609620478122">"Sparuj"</string>
     <string name="bluetooth_cancel" msgid="4152153558528588479">"Anuluj"</string>
     <string name="system_cast" msgid="6421567823845207156">"Google Cast"</string>
     <string name="system_date_time" msgid="8898457978560618950">"Data i godzina"</string>
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"Ułatwienia dostępu"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"Opcje programistyczne"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"Brak"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"Użycie i diagnostyka"</string>
     <string name="about_system_update" msgid="7282772247661356586">"Aktualizacje systemu"</string>
     <string name="about_preference" msgid="4131396784531360434">"Informacje"</string>
     <string name="device_name" msgid="2670488158531273028">"Nazwa urządzenia"</string>
diff --git a/Settings/res/values-pt-rBR/strings.xml b/Settings/res/values-pt-rBR/strings.xml
index 057ab94..34a6d4e 100644
--- a/Settings/res/values-pt-rBR/strings.xml
+++ b/Settings/res/values-pt-rBR/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"Acessibilidade"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"Opções do desenvolvedor"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"Nenhum"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"Uso e diagnóstico"</string>
     <string name="about_system_update" msgid="7282772247661356586">"Atualização do sistema"</string>
     <string name="about_preference" msgid="4131396784531360434">"Sobre"</string>
     <string name="device_name" msgid="2670488158531273028">"Nome do dispositivo"</string>
diff --git a/Settings/res/values-pt-rPT/strings.xml b/Settings/res/values-pt-rPT/strings.xml
index 082c02f..121584c 100644
--- a/Settings/res/values-pt-rPT/strings.xml
+++ b/Settings/res/values-pt-rPT/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"Acessibilidade"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"Opções de programador"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"Nenhuma"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"Utilização e diagnósticos"</string>
     <string name="about_system_update" msgid="7282772247661356586">"Atualização do sistema"</string>
     <string name="about_preference" msgid="4131396784531360434">"Acerca de"</string>
     <string name="device_name" msgid="2670488158531273028">"Nome do dispositivo"</string>
diff --git a/Settings/res/values-pt/strings.xml b/Settings/res/values-pt/strings.xml
index 057ab94..34a6d4e 100644
--- a/Settings/res/values-pt/strings.xml
+++ b/Settings/res/values-pt/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"Acessibilidade"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"Opções do desenvolvedor"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"Nenhum"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"Uso e diagnóstico"</string>
     <string name="about_system_update" msgid="7282772247661356586">"Atualização do sistema"</string>
     <string name="about_preference" msgid="4131396784531360434">"Sobre"</string>
     <string name="device_name" msgid="2670488158531273028">"Nome do dispositivo"</string>
diff --git a/Settings/res/values-ro/strings.xml b/Settings/res/values-ro/strings.xml
index e7c5e80..be10fb4 100644
--- a/Settings/res/values-ro/strings.xml
+++ b/Settings/res/values-ro/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"Accesibilitate"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"Opțiuni dezvoltator"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"Niciuna"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"Utilizare și diagnosticare"</string>
     <string name="about_system_update" msgid="7282772247661356586">"Actualizare de sistem"</string>
     <string name="about_preference" msgid="4131396784531360434">"Despre"</string>
     <string name="device_name" msgid="2670488158531273028">"Nume dispozitiv"</string>
diff --git a/Settings/res/values-ru/strings.xml b/Settings/res/values-ru/strings.xml
index f759310..600b8da 100644
--- a/Settings/res/values-ru/strings.xml
+++ b/Settings/res/values-ru/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"Специальные возможности"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"Для разработчиков"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"Нет"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"Статистика и диагностика"</string>
     <string name="about_system_update" msgid="7282772247661356586">"Обновление системы"</string>
     <string name="about_preference" msgid="4131396784531360434">"Об устройстве"</string>
     <string name="device_name" msgid="2670488158531273028">"Название устройства"</string>
diff --git a/Settings/res/values-si-rLK/strings.xml b/Settings/res/values-si-rLK/strings.xml
index d398653..2e9874a 100644
--- a/Settings/res/values-si-rLK/strings.xml
+++ b/Settings/res/values-si-rLK/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"ප්‍රවේශ්‍යතාව"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"වර්ධක විකල්ප"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"කිසිවක් නැත"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"භාවිතය සහ නිර්ණය"</string>
     <string name="about_system_update" msgid="7282772247661356586">"පද්ධතිය යාවත්කාලීන කිරීම"</string>
     <string name="about_preference" msgid="4131396784531360434">"පිළිබඳ"</string>
     <string name="device_name" msgid="2670488158531273028">"උපාංගයේ නම"</string>
diff --git a/Settings/res/values-sk/strings.xml b/Settings/res/values-sk/strings.xml
index 1fe0f07..a059807 100644
--- a/Settings/res/values-sk/strings.xml
+++ b/Settings/res/values-sk/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"Zjednodušenie ovládania"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"Možnosti pre vývojárov"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"Žiadna"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"Využitie a diagnostika"</string>
     <string name="about_system_update" msgid="7282772247661356586">"Aktualizácia systému"</string>
     <string name="about_preference" msgid="4131396784531360434">"Informácie"</string>
     <string name="device_name" msgid="2670488158531273028">"Názov zariadenia"</string>
diff --git a/Settings/res/values-sl/strings.xml b/Settings/res/values-sl/strings.xml
index 63e40df..7e0bbf7 100644
--- a/Settings/res/values-sl/strings.xml
+++ b/Settings/res/values-sl/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"Dostopnost"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"Možnosti za razvijalce"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"Brez"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"Uporaba in diagnostika"</string>
     <string name="about_system_update" msgid="7282772247661356586">"Sistemska posodobitev"</string>
     <string name="about_preference" msgid="4131396784531360434">"Vizitka"</string>
     <string name="device_name" msgid="2670488158531273028">"Ime naprave"</string>
diff --git a/Settings/res/values-sq-rAL/strings.xml b/Settings/res/values-sq-rAL/strings.xml
index 5fb90a2..798992b 100644
--- a/Settings/res/values-sq-rAL/strings.xml
+++ b/Settings/res/values-sq-rAL/strings.xml
@@ -177,6 +177,8 @@
     <skip />
     <!-- no translation found for accessibility_none (3441648940134070004) -->
     <skip />
+    <!-- no translation found for system_diagnostic (7269638365915225701) -->
+    <skip />
     <!-- no translation found for about_system_update (7282772247661356586) -->
     <skip />
     <!-- no translation found for about_preference (4131396784531360434) -->
diff --git a/Settings/res/values-sr/strings.xml b/Settings/res/values-sr/strings.xml
index ce07f1e..bc43be3 100644
--- a/Settings/res/values-sr/strings.xml
+++ b/Settings/res/values-sr/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"Приступачност"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"Опције за програмера"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"Ништа"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"Коришћење и дијагностика"</string>
     <string name="about_system_update" msgid="7282772247661356586">"Ажурирање система"</string>
     <string name="about_preference" msgid="4131396784531360434">"Основни подаци"</string>
     <string name="device_name" msgid="2670488158531273028">"Назив уређаја"</string>
diff --git a/Settings/res/values-sv/strings.xml b/Settings/res/values-sv/strings.xml
index 98f8610..ffb3d2c 100644
--- a/Settings/res/values-sv/strings.xml
+++ b/Settings/res/values-sv/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"Tillgänglighet"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"Utvecklaralternativ"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"Inga"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"Användning och diagnostik"</string>
     <string name="about_system_update" msgid="7282772247661356586">"Systemuppdatering"</string>
     <string name="about_preference" msgid="4131396784531360434">"Om"</string>
     <string name="device_name" msgid="2670488158531273028">"Enhetens namn"</string>
diff --git a/Settings/res/values-sw/strings.xml b/Settings/res/values-sw/strings.xml
index 8947f0a..60d633c 100644
--- a/Settings/res/values-sw/strings.xml
+++ b/Settings/res/values-sw/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"Ufikiaji"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"Chaguo za wasanidi programu"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"Hakuna"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"Matumizi &amp; Uchunguzi"</string>
     <string name="about_system_update" msgid="7282772247661356586">"Sasisho la mfumo"</string>
     <string name="about_preference" msgid="4131396784531360434">"Kuhusu"</string>
     <string name="device_name" msgid="2670488158531273028">"Jina la kifaa"</string>
diff --git a/Settings/res/values-ta-rIN/strings.xml b/Settings/res/values-ta-rIN/strings.xml
index 8540fa7..1244cc3 100644
--- a/Settings/res/values-ta-rIN/strings.xml
+++ b/Settings/res/values-ta-rIN/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"அணுகல்தன்மை"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"டெவெலப்பர் விருப்பங்கள்"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"ஏதுமில்லை"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"உபயோகம் &amp; பிழை ஆய்வுகள்"</string>
     <string name="about_system_update" msgid="7282772247661356586">"முறைமை புதுப்பிப்பு"</string>
     <string name="about_preference" msgid="4131396784531360434">"அறிமுகம்"</string>
     <string name="device_name" msgid="2670488158531273028">"சாதனத்தின் பெயர்"</string>
diff --git a/Settings/res/values-te-rIN/strings.xml b/Settings/res/values-te-rIN/strings.xml
index 89ba048..a708c9b 100644
--- a/Settings/res/values-te-rIN/strings.xml
+++ b/Settings/res/values-te-rIN/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"ప్రాప్యత సామర్థ్యం"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"డెవలపర్ ఎంపికలు"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"ఏదీ లేదు"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"వినియోగం &amp; విశ్లేషణలు"</string>
     <string name="about_system_update" msgid="7282772247661356586">"సిస్టమ్ నవీకరణ"</string>
     <string name="about_preference" msgid="4131396784531360434">"పరిచయం"</string>
     <string name="device_name" msgid="2670488158531273028">"పరికరం పేరు"</string>
diff --git a/Settings/res/values-th/strings.xml b/Settings/res/values-th/strings.xml
index 9a81588..0d939d2 100644
--- a/Settings/res/values-th/strings.xml
+++ b/Settings/res/values-th/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"การเข้าถึง"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"ตัวเลือกสำหรับนักพัฒนา"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"ไม่มี"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"การใช้และการวินิจฉัย"</string>
     <string name="about_system_update" msgid="7282772247661356586">"การอัปเดตระบบ"</string>
     <string name="about_preference" msgid="4131396784531360434">"เกี่ยวกับ"</string>
     <string name="device_name" msgid="2670488158531273028">"ชื่ออุปกรณ์"</string>
diff --git a/Settings/res/values-tl/strings.xml b/Settings/res/values-tl/strings.xml
index ee6da16..b53fa1a 100644
--- a/Settings/res/values-tl/strings.xml
+++ b/Settings/res/values-tl/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"Accessibility"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"Mga pagpipilian ng developer"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"Wala"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"Paggamit at Mga Diagnostic"</string>
     <string name="about_system_update" msgid="7282772247661356586">"Pag-update ng system"</string>
     <string name="about_preference" msgid="4131396784531360434">"Tungkol dito"</string>
     <string name="device_name" msgid="2670488158531273028">"Pangalan ng device"</string>
diff --git a/Settings/res/values-tr/strings.xml b/Settings/res/values-tr/strings.xml
index be7a180..b9f53eb 100644
--- a/Settings/res/values-tr/strings.xml
+++ b/Settings/res/values-tr/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"Erişilebilirlik"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"Geliştirici seçenekleri"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"Yok"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"Kullanım ve Teşhis"</string>
     <string name="about_system_update" msgid="7282772247661356586">"Sistem güncellemesi"</string>
     <string name="about_preference" msgid="4131396784531360434">"Hakkında"</string>
     <string name="device_name" msgid="2670488158531273028">"Cihaz adı"</string>
@@ -312,7 +313,7 @@
     <string name="location_reporting" msgid="3054236612250063073">"Konum Bildirme"</string>
     <string name="location_history" msgid="2946680949724247804">"Konum Geçmişi"</string>
     <string name="location_reporting_desc" msgid="6256424995139430823">"Google bu özelliği, Google Asistan ve Google Haritalar gibi ürünlerde kullanmaktadır. Konum Bildirme\'yi açmak bu özelliği kullanan tüm Google ürünlerinin cihazınızın son konum verilerini Google Hesabınızla bağlantılı olarak depolamasına ve kullanmasına olanak sağlar."</string>
-    <string name="location_history_desc" msgid="3861249867748294369">"Bu hesap için Konum Geçmişi açıldığında Google, uygulamalarınızın kullanması için cihazınızın konum verilerini depolayabilir.\n\nÖrneğin, Google Haritalar size yol tarifleri sunabilir ve Google Asistan işe gidip gelme trafiği hakkında sizi bilgilendirebilir.\n\nKonum Geçmişi\'ni istediğiniz zaman kapatabilirsiniz, ancak bunu yaptığınızda, geçmişiniz silinmez. Konum Geçmişinizi görüntülemek ve yönetmek için maps.google.com/locationhistory adresini ziyaret edin."</string>
+    <string name="location_history_desc" msgid="3861249867748294369">"Bu hesap için Konum Geçmişi açıldığında Google, uygulamalarınızın kullanması için cihazınızın konum verilerini depolayabilir.\n\nÖrneğin, Google Haritalar size yol tarifi sunabilir ve Google Asistan işe gidip gelme trafiği hakkında sizi bilgilendirebilir.\n\nKonum Geçmişi\'ni istediğiniz zaman kapatabilirsiniz, ancak bunu yaptığınızda, geçmişiniz silinmez. Konum Geçmişinizi görüntülemek ve yönetmek için maps.google.com/locationhistory adresini ziyaret edin."</string>
     <string name="delete_location_history_title" msgid="5804802702252280549">"Konum Geçmişi\'ni sil"</string>
     <string name="delete_location_history_desc" msgid="4142806827237093397">"Bu işlem, ilgili Google Hesabı için bu cihazda depolanmış tüm Konum Geçmişi\'ni silecektir. Bu silme işlemini geri alamazsınız. Google Asistan gibi bazı uygulamalar çalışmayı durduracaktır."</string>
     <string name="system_services" msgid="7230571820151215779">"Hizmetler"</string>
diff --git a/Settings/res/values-uk/strings.xml b/Settings/res/values-uk/strings.xml
index 7ac9b44..57ecc40 100644
--- a/Settings/res/values-uk/strings.xml
+++ b/Settings/res/values-uk/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"Доступність"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"Параметри розробника"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"Немає"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"Використання та діагностика"</string>
     <string name="about_system_update" msgid="7282772247661356586">"Оновлення системи"</string>
     <string name="about_preference" msgid="4131396784531360434">"Інфо"</string>
     <string name="device_name" msgid="2670488158531273028">"Назва пристрою"</string>
diff --git a/Settings/res/values-ur-rPK/strings.xml b/Settings/res/values-ur-rPK/strings.xml
index a2c1610..791ff09 100644
--- a/Settings/res/values-ur-rPK/strings.xml
+++ b/Settings/res/values-ur-rPK/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"حالت رسائی"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"ڈیولپر کے اختیارات"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"کوئی نہیں"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"استعمال اور تشخیصات"</string>
     <string name="about_system_update" msgid="7282772247661356586">"سسٹم اپ ڈیٹ"</string>
     <string name="about_preference" msgid="4131396784531360434">"تفصیل"</string>
     <string name="device_name" msgid="2670488158531273028">"آلہ کا نام"</string>
diff --git a/Settings/res/values-uz-rUZ/strings.xml b/Settings/res/values-uz-rUZ/strings.xml
index 923d7e5..c3fa606 100644
--- a/Settings/res/values-uz-rUZ/strings.xml
+++ b/Settings/res/values-uz-rUZ/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"Maxsus imkoniyatlar"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"Dasturchi sozlamalari"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"Hech biri"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"Foydalanish statistikasi va tashxis"</string>
     <string name="about_system_update" msgid="7282772247661356586">"Tizim yangilanishi"</string>
     <string name="about_preference" msgid="4131396784531360434">"Ma’lumot"</string>
     <string name="device_name" msgid="2670488158531273028">"Qurilma nomi"</string>
diff --git a/Settings/res/values-vi/strings.xml b/Settings/res/values-vi/strings.xml
index 19b3b2a..4448a89 100644
--- a/Settings/res/values-vi/strings.xml
+++ b/Settings/res/values-vi/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"Trợ năng"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"Tùy chọn nhà phát triển"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"Không có"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"Sử dụng và chẩn đoán"</string>
     <string name="about_system_update" msgid="7282772247661356586">"Bản cập nhật hệ thống"</string>
     <string name="about_preference" msgid="4131396784531360434">"Giới thiệu"</string>
     <string name="device_name" msgid="2670488158531273028">"Tên thiết bị"</string>
diff --git a/Settings/res/values-zh-rCN/strings.xml b/Settings/res/values-zh-rCN/strings.xml
index 8e1929e..18a6caf 100644
--- a/Settings/res/values-zh-rCN/strings.xml
+++ b/Settings/res/values-zh-rCN/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"无障碍"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"开发者选项"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"无"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"使用情况和诊断信息"</string>
     <string name="about_system_update" msgid="7282772247661356586">"系统更新"</string>
     <string name="about_preference" msgid="4131396784531360434">"关于"</string>
     <string name="device_name" msgid="2670488158531273028">"设备名称"</string>
diff --git a/Settings/res/values-zh-rHK/strings.xml b/Settings/res/values-zh-rHK/strings.xml
index 985956b..757d0b3 100644
--- a/Settings/res/values-zh-rHK/strings.xml
+++ b/Settings/res/values-zh-rHK/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"協助工具"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"開發人員選項"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"無"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"使用情況與診斷"</string>
     <string name="about_system_update" msgid="7282772247661356586">"系統更新"</string>
     <string name="about_preference" msgid="4131396784531360434">"關於"</string>
     <string name="device_name" msgid="2670488158531273028">"裝置名稱"</string>
diff --git a/Settings/res/values-zh-rTW/strings.xml b/Settings/res/values-zh-rTW/strings.xml
index de63d7b..b22127d 100644
--- a/Settings/res/values-zh-rTW/strings.xml
+++ b/Settings/res/values-zh-rTW/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"協助工具"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"開發人員選項"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"無"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"使用情形與診斷資訊"</string>
     <string name="about_system_update" msgid="7282772247661356586">"系統更新"</string>
     <string name="about_preference" msgid="4131396784531360434">"關於"</string>
     <string name="device_name" msgid="2670488158531273028">"裝置名稱"</string>
diff --git a/Settings/res/values-zu/strings.xml b/Settings/res/values-zu/strings.xml
index 60d9c02..3caf6b7 100644
--- a/Settings/res/values-zu/strings.xml
+++ b/Settings/res/values-zu/strings.xml
@@ -97,6 +97,7 @@
     <string name="system_accessibility" msgid="6215431399759498005">"Ukufinyeleleka"</string>
     <string name="system_developer_options" msgid="3237985523474863638">"Izinketho zonjiniyela"</string>
     <string name="accessibility_none" msgid="3441648940134070004">"Lutho"</string>
+    <string name="system_diagnostic" msgid="7269638365915225701">"Ukusetshenziswa nokuhlolwa"</string>
     <string name="about_system_update" msgid="7282772247661356586">"Ukubuyekeza isistimu"</string>
     <string name="about_preference" msgid="4131396784531360434">"Mayelana"</string>
     <string name="device_name" msgid="2670488158531273028">"Igama ledivayisi"</string>
diff --git a/Settings/res/values/strings.xml b/Settings/res/values/strings.xml
index 40413a1..718b3af 100644
--- a/Settings/res/values/strings.xml
+++ b/Settings/res/values/strings.xml
@@ -205,6 +205,8 @@
     <string name="system_developer_options">Developer options</string>
     <!-- Label for no accessibility color or opacity [CHAR LIMIT=50] -->
     <string name="accessibility_none">None</string>
+    <!-- Preference which manages Diagnostic and Usage reporting -->
+    <string name="system_diagnostic">Usage &amp; Diagnostics</string>
 
     <!-- About -->
     <skip />
diff --git a/Settings/res/xml/personal.xml b/Settings/res/xml/personal.xml
index 510cc38..bc52e0d 100644
--- a/Settings/res/xml/personal.xml
+++ b/Settings/res/xml/personal.xml
@@ -39,5 +39,12 @@
             android:targetClass="com.android.tv.settings.system.SecurityActivity"
             android:targetPackage="com.android.tv.settings" />
     </Preference>
+    <Preference
+        android:icon="@drawable/ic_settings_diagnostic"
+        android:key="usageAndDiag"
+        android:title="@string/system_diagnostic" >
+        <intent
+            android:action="com.google.android.gsf.notouch.USAGE_AND_DIAGNOSTICS_SETTING" />
+    </Preference>
 
 </PreferenceScreen>
diff --git a/Settings/src/com/android/tv/settings/BrowseInfo.java b/Settings/src/com/android/tv/settings/BrowseInfo.java
index af4f16b..79c95bc 100644
--- a/Settings/src/com/android/tv/settings/BrowseInfo.java
+++ b/Settings/src/com/android/tv/settings/BrowseInfo.java
@@ -165,6 +165,7 @@
     private static final String PREF_KEY_HOME = "home";
     private static final String PREF_KEY_CAST = "cast";
     private static final String PREF_KEY_GOOGLESETTINGS = "googleSettings";
+    private static final String PREF_KEY_USAGE_AND_DIAG = "usageAndDiag";
 
     private final Context mContext;
     private final AuthenticatorHelper mAuthenticatorHelper;
@@ -316,6 +317,16 @@
                         Log.e(TAG, "Error adding google settings", e);
                     }
                 }
+            } else if (PREF_KEY_USAGE_AND_DIAG.equals(key)) {
+                Intent i = getIntent(parser, attrs);
+                if (systemIntentIsHandled(i) != null) {
+                    mRow.add(new MenuItem.Builder()
+                            .id(mNextItemId++)
+                            .title(title)
+                            .imageResourceId(mContext, iconRes)
+                            .intent(i)
+                            .build());
+                }
             } else if (!PREF_KEY_INPUTS.equals(key) || mInputSettingNeeded) {
                 MenuItem.TextGetter descriptionGetter = getDescriptionTextGetterFromKey(key);
                 MenuItem.UriGetter uriGetter = getIconUriGetterFromKey(key);
@@ -358,9 +369,10 @@
             }
             ArrayObjectAdapter row = mRows.get(mAccountHeaderId);
             // Clear any account row cards that are not "Location" or "Security".
-            String dontDelete[] = new String[2];
+            String dontDelete[] = new String[3];
             dontDelete[0] = mContext.getString(R.string.system_location);
             dontDelete[1] = mContext.getString(R.string.system_security);
+            dontDelete[2] = mContext.getString(R.string.system_diagnostic);
             int i = 0;
             while (i < row.size ()) {
                 MenuItem menuItem = (MenuItem) row.get(i);
diff --git a/Settings/src/com/android/tv/settings/device/StorageResetActivity.java b/Settings/src/com/android/tv/settings/device/StorageResetActivity.java
index 3e88b36..4e7cd78 100644
--- a/Settings/src/com/android/tv/settings/device/StorageResetActivity.java
+++ b/Settings/src/com/android/tv/settings/device/StorageResetActivity.java
@@ -453,7 +453,9 @@
 
             boolean showMigrate = false;
             final VolumeInfo currentExternal = getPackageManager().getPrimaryStorageCurrentVolume();
-            if (!TextUtils.equals(currentExternal.getId(), volumeId)) {
+            // currentExternal will be null if the drive is not mounted. Don't offer the option to
+            // migrate if so.
+            if (currentExternal != null && !TextUtils.equals(currentExternal.getId(), volumeId)) {
                 final List<VolumeInfo> candidates =
                         getPackageManager().getPrimaryStorageCandidateVolumes();
                 for (final VolumeInfo candidate : candidates) {