[automerger skipped] Import translations. DO NOT MERGE am: b2a7d1ff2b -s ours am: 57599e6e6b -s ours
am skip reason: subject contains skip directive

Change-Id: Ibe41ed275c8625c42abfb40d91214505282dbc33
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9f33717..0ab5511 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -206,6 +206,12 @@
 
             <intent-filter android:priority="100">
                 <action android:name="android.settings.INTERNAL_STORAGE_SETTINGS" />
+                <action android:name="android.os.storage.action.MANAGE_STORAGE" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+
+            <intent-filter android:priority="100">
+                <action android:name="android.settings.SECURITY_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
 
@@ -330,6 +336,17 @@
                   android:windowSoftInputMode="adjustResize">
         </activity>
 
+        <activity android:name=".security.CredentialStorageActivity"
+                  android:theme="@style/ActionDialogTheme"
+                  android:launchMode="singleTop"
+                  android:configChanges="orientation|keyboardHidden|screenSize">
+            <intent-filter android:priority="1">
+                <action android:name="com.android.credentials.INSTALL" />
+                <action android:name="com.android.credentials.RESET" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
         <activity android:name=".system.ThirdPartyLicensesActivity"
                   android:label="@string/settings_license_activity_title"
                   android:configChanges="orientation|keyboardHidden|screenSize"
diff --git a/res/values-af/config.xml b/res/values-af/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-af/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 06b13bd..d416521 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"Nie vir hierdie gebruiker geïnstalleer nie"</string>
     <string name="permissions_label" msgid="2701446753515612685">"Toestemmings"</string>
     <string name="notifications_label" msgid="6586089149665170731">"Kennisgewings"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"Berging en kas"</string>
     <string name="application_version_label" msgid="8556889839783311649">"Weergawe: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"Geen toestemmings is verleen nie"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"Geen toestemmings is versoek nie"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s se interne berging"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"Datagebruik"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"Programdatagebruik"</string>
     <string name="computing_size" msgid="5791407621793083965">"Bereken tans …"</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"Onlangse liggingversoeke"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"Geen onlangse liggingversoeke nie"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"Programvlaktoestemmings"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"Skandering"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"Liggingdienste"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Wi‑Fi-opsporing"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Laat programme en dienste toe om enige tyd na Wi-Fi-netwerke te soek, selfs wanneer Wi-Fi af is. Dit kan byvoorbeeld gebruik word om ligginggegronde kenmerke en dienste te verbeter."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"Bluetooth-opsporing"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"Laat programme en dienste toe om enige tyd na toestelle in die omtrek te soek, selfs wanneer Bluetooth af is. Dit kan byvoorbeeld gebruik word om ligginggegronde kenmerke en dienste te verbeter."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"Stelsel"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"Stelselopdaterings"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Android-weergawe"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>-inskrywing het misluk"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"As jy \'n vertroude toestel byvoeg, sal daar van jou vereis word om volgende \'n stawingsmetode op te stel. As jy nie jou vertroude toestel by jou het nie, sal stawing vereis word om by jou profiel in te gaan."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"Toestel is ontkoppel."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"Vee eiebewyse uit"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"Verwyder alle sertifikate"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"Verwyder al die inhoud?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"Eiebewysberging is uitgevee."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"Eiebewysberging kon nie uitgevee word nie."</string>
     <string name="forget" msgid="3971143908183848527">"Vergeet"</string>
     <string name="connect" msgid="5861699594602380150">"Koppel"</string>
     <string name="disconnect" msgid="6140789953324820336">"Ontkoppel"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Dit sal die demonstrasierekening uitvee en \'n fabriekterugstelling op die stelsel uitvoer. Alle gebruikerdata sal verloor word."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Verlaat demonstrasie"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"WYS AF"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"Kenmerk is nie beskikbaar terwyl jy bestuur nie."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"Kan nie gebruiker byvoeg terwyl jy bestuur nie."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"Kenmerk is nie beskikbaar terwyl jy bestuur nie"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"Kan nie gebruiker byvoeg terwyl jy bestuur nie"</string>
 </resources>
diff --git a/res/values-am/config.xml b/res/values-am/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-am/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index f25b3cd..dc5aca7 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"ለዚህ ተጠቃሚ አልተጫነም"</string>
     <string name="permissions_label" msgid="2701446753515612685">"ፈቃዶች"</string>
     <string name="notifications_label" msgid="6586089149665170731">"ማሳወቂያዎች"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"ማከማቻ እና መሸጎጫ"</string>
     <string name="application_version_label" msgid="8556889839783311649">"ስሪት፦ %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"ምንም ፈቃዶች አልተሰጡም"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"ምንም ፈቃዶች አልተጠየቁም"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s በውስጣዊ ማከማቻ ውስጥ ነው"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"የውሂብ አጠቃቀም"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"የመተግበሪያ ውሂብ አጠቃቀም"</string>
     <string name="computing_size" msgid="5791407621793083965">"በማስላት ላይ…"</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"የቅርብ ጊዜ የአካባቢ ጥያቄዎች"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"ምንም የቅርብ ጊዜ የአካባቢ ጥያቄዎች የሉም"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"የመተግበሪያ ደረጃ ፈቃዶች"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"በመቃኘት ላይ"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"የአካባቢ አገልግሎቶች"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Wi‑Fi ቅኝት"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Wi-Fi ጠፍቶ ቢሆንም እንኳ በማንኛውም ጊዜ የWi-Fi አውታረ መረቦችን እንዲቃኙ ይፍቀዱ። ይህ ለምሳሌ በአካባቢ ላይ የተመሠረቱ ባሕሪያትን እና አገልግሎቶችን ለማሻሻል ጥቅም ላይ ሊውል ይችላል።"</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"የብሉቱዝ ቅኝት"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"ብሉቱዝ ጠፍቶ ቢሆንም እንኳ በማንኛውም ጊዜ መተግበሪያዎች እና አገልግሎቶች በአቅራቢያ ያሉ መሣሪያዎችን እንዲቃኙ ይፍቀዱ። ይህ ለምሳሌ በአካባቢ ላይ የተመሠረቱ ባሕሪያትን እና አገልግሎቶችን ለማሻሻል ጥቅም ላይ ሊውል ይችላል።"</string>
     <string name="system_setting_title" msgid="6864599341809463440">"ሥርዓት"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"የሥርዓት ዝማኔዎች"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Android ሥሪት"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> መመዝገብ አልተሳካም"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"የታመነ መሣሪያን ማከል ቀጥለው የማረጋገጫ ዘዴን እንዲያክሉ ይፈልግብዎታል። የታመነ መሣሪያዎ ከእርስዎ ጋር ከሌለ መገለጫዎን ለመድረስ ማረጋገጫ ያስፈልጋል።"</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"የመሣሪያ ግንኙነት ተቋርጧል።"</string>
+    <string name="credentials_reset" msgid="873900550885788639">"መረጃዎችን አጽዳ"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"ሁሉንም ምስክሮች አስወግድ"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"ሁሉም ይዘቶች ይወገድ?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"የማስረጃ ማከማቻ ተደምስሷል።"</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"የማስረጃ ማከማቻ ሊደመሰስ አልቻለም።"</string>
     <string name="forget" msgid="3971143908183848527">"እርሳ"</string>
     <string name="connect" msgid="5861699594602380150">"አገናኝ"</string>
     <string name="disconnect" msgid="6140789953324820336">"ግንኙነት አቋርጥ"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"ይህ የልምምድ መለያውን እና የፋብሪካ ዳግም አስጀምር ሥርዓቱን ይሰርዛል። ሁሉም የተጠቃሚ ውሂብ ይጠፋል።"</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"ከማሳያ ውጣ"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"አሰናብት"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"እየነዱ ሳለ ባህሪ አይገኝም።"</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"እየነዱ ሳለ ተጠቃሚን ማከል አይቻልም።"</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"እየነዱ ሳለ ባህሪው አይገኝም"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"እየነዱ ሳለ ተጠቃሚን ማከል አይቻልም"</string>
 </resources>
diff --git a/res/values-ar/config.xml b/res/values-ar/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-ar/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index e3782ce..90b6b84 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -169,7 +169,7 @@
     <string name="bluetooth_device" msgid="3178478829314083240">"جهاز بدون اسم"</string>
     <string name="bluetooth_paired_devices" msgid="6463199569164652410">"الأجهزة المقترنة"</string>
     <string name="bluetooth_pair_new_device" msgid="6948753485443263095">"إقران جهاز جديد"</string>
-    <string name="bluetooth_pair_new_device_summary" msgid="2497221247690369031">"سيتمّ تشغيل بلوتوث للإقران."</string>
+    <string name="bluetooth_pair_new_device_summary" msgid="2497221247690369031">"سيتمّ تفعيل بلوتوث للإقران."</string>
     <string name="bluetooth_disconnect_title" msgid="7675271355910637528">"هل تريد إلغاء ربط الجهاز؟"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="2017519733701757244">"سيتمّ إلغاء ربط سيارتك بالجهاز <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_vehicle_mac_address" msgid="7069234636525805937">"عنوان بلوتوث السيارة: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
@@ -181,11 +181,11 @@
     <string name="bluetooth_available_devices" msgid="1854446368146061448">"الأجهزة المُتاحة"</string>
     <string name="bluetooth_profiles" msgid="5580372290862835951">"الملفات الشخصية"</string>
     <string name="bluetooth_error_title" msgid="2341600997536511742"></string>
-    <string name="bluetooth_turning_on" msgid="7046983059601710414">"جارٍ تشغيل البلوتوث..."</string>
-    <string name="bluetooth_turning_off" msgid="1753975097241024061">"جارٍ إيقاف تشغيل البلوتوث..."</string>
-    <string name="bluetooth_ask_enablement" msgid="8565428400407368667">"يريد <xliff:g id="APP_NAME">%1$s</xliff:g> تشغيل البلوتوث"</string>
+    <string name="bluetooth_turning_on" msgid="7046983059601710414">"جارٍ تفعيل البلوتوث..."</string>
+    <string name="bluetooth_turning_off" msgid="1753975097241024061">"جارٍ إيقاف تفعيل البلوتوث..."</string>
+    <string name="bluetooth_ask_enablement" msgid="8565428400407368667">"يريد <xliff:g id="APP_NAME">%1$s</xliff:g> تفعيل البلوتوث"</string>
     <string name="bluetooth_ask_disablement" msgid="6056441896274912839">"يريد <xliff:g id="APP_NAME">%1$s</xliff:g> إيقاف البلوتوث"</string>
-    <string name="bluetooth_ask_enablement_no_name" msgid="3191739265037605547">"يريد أحد التطبيقات تشغيل بلوتوث"</string>
+    <string name="bluetooth_ask_enablement_no_name" msgid="3191739265037605547">"يريد أحد التطبيقات تفعيل بلوتوث"</string>
     <string name="bluetooth_ask_disablement_no_name" msgid="5694464250599567283">"يريد أحد التطبيقات إيقاف البلوتوث"</string>
     <string name="bluetooth_ask_discovery" msgid="8774333095928068465">"يريد <xliff:g id="APP_NAME">%1$s</xliff:g> أن تكون وحدة الرأس مرئية لأجهزة البلوتوث الأخرى لمدة <xliff:g id="TIMEOUT">%2$d</xliff:g> من الثواني."</string>
     <string name="bluetooth_ask_discovery_no_name" msgid="164397600370102369">"يريد أحد التطبيقات أن تكون وحدة الرأس مرئية لأجهزة البلوتوث الأخرى لمدة <xliff:g id="TIMEOUT">%1$d</xliff:g> من الثواني."</string>
@@ -291,9 +291,11 @@
     <string name="not_installed" msgid="4218816013370552746">"لم يتم تثبيت التطبيق لهذا المستخدم."</string>
     <string name="permissions_label" msgid="2701446753515612685">"الأذونات"</string>
     <string name="notifications_label" msgid="6586089149665170731">"الإشعارات"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"التخزين وذاكرة التخزين المؤقت"</string>
     <string name="application_version_label" msgid="8556889839783311649">"الإصدار: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"لم يتم منح أي أذونات."</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"لم يتم طلب أي أذونات."</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"وحدة التخزين الداخلية %s"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"استخدام البيانات"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"استخدام بيانات التطبيق"</string>
     <string name="computing_size" msgid="5791407621793083965">"جارٍ الحساب…"</string>
@@ -356,12 +358,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"طلبات الموقع الجغرافي الأخيرة"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"لا توجد طلبات حديثة للموقع الجغرافي."</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"الأذونات على مستوى التطبيقات"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"البحث عن الموقع الجغرافي"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"خدمات الموقع الجغرافي"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"البحث عن شبكات Wi-Fi"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"يمكنك السماح للتطبيقات والخدمات بالبحث عن الأجهزة المجاورة في أيّ وقت، حتى في حال إيقاف Wi‑Fi. ويمكن استخدام هذه البيانات مثلاً لتحسين الميزات والخدمات المستندة إلى الموقع الجغرافي."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"البحث عن بلوتوث"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"يمكنك السماح للتطبيقات والخدمات بالبحث عن الأجهزة المجاورة في أيّ وقت، حتى في حال إيقاف البلوتوث. ويمكن استخدام هذه البيانات مثلاً لتحسين الميزات والخدمات المستندة إلى الموقع الجغرافي."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"النظام"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"تحديثات النظام"</string>
     <string name="firmware_version" msgid="8491753744549309333">"إصدار Android"</string>
@@ -406,7 +403,7 @@
     <string name="show_dev_already" msgid="1678087328973865736">"لا حاجة لذلك، فأنت مطوّر برامج فعلاً."</string>
     <string name="developer_options_settings" msgid="1530739225109118480">"خيارات المطوّرين"</string>
     <string name="reset_options_title" msgid="4388902952861833420">"خيارات إعادة الضبط"</string>
-    <string name="reset_options_summary" msgid="5508201367420359293">"إعادة تعيين الشبكة أو التطبيقات أو الجهاز"</string>
+    <string name="reset_options_summary" msgid="5508201367420359293">"إعادة ضبط الشبكة أو التطبيقات أو الجهاز"</string>
     <string name="reset_network_title" msgid="1284233059990797263">"إعادة ضبط الشبكة"</string>
     <string name="reset_network_desc" msgid="602381374544634925">"سيؤدي هذا الإجراء إلى إعادة ضبط جميع إعدادات الشبكة، بما في ذلك:"</string>
     <string name="reset_network_item_wifi" msgid="7569481589699982698"><li>"Wi‑Fi"</li></string>
@@ -422,7 +419,7 @@
     <string name="reset_network_confirm_button_text" msgid="5246859685069024851">"إعادة ضبط الإعدادات"</string>
     <string name="reset_network_complete_toast" msgid="3804108209431416865">"تمت إعادة ضبط إعدادات الشبكة."</string>
     <string name="reset_app_pref_title" msgid="5855420038951743992">"إعادة ضبط خيارات التطبيقات المفضّلة"</string>
-    <string name="reset_app_pref_desc" msgid="579392665146962149">"يؤدي ذلك إلى إعادة تعيين جميع الإعدادات المفضَّلة لما يلي:\n\n"<li>"التطبيقات الموقوفة"</li>\n<li>"إشعارات التطبيقات الموقوفة"</li>\n<li>"التطبيقات التلقائية للإجراءات"</li>\n<li>"القيود على البيانات الخلفية للتطبيقات"</li>\n<li>"أيّ قيود على الأذونات"</li>\n\n"ولن تفقد أيّ بيانات للتطبيقات."</string>
+    <string name="reset_app_pref_desc" msgid="579392665146962149">"يؤدي ذلك إلى إعادة ضبط جميع الإعدادات المفضَّلة لما يلي:\n\n"<li>"التطبيقات الموقوفة"</li>\n<li>"إشعارات التطبيقات الموقوفة"</li>\n<li>"التطبيقات التلقائية للإجراءات"</li>\n<li>"القيود على البيانات الخلفية للتطبيقات"</li>\n<li>"أيّ قيود على الأذونات"</li>\n\n"ولن تفقد أيّ بيانات للتطبيقات."</string>
     <string name="reset_app_pref_button_text" msgid="6270820447321231609">"إعادة ضبط التطبيقات"</string>
     <string name="reset_app_pref_complete_toast" msgid="8709072932243594166">"تم إعادة ضبط خيارات التطبيقات المفضّلة"</string>
     <string name="master_clear_title" msgid="8515335233363214414">"محو جميع البيانات (factory reset)"</string>
@@ -457,7 +454,7 @@
     <string name="signed_in_admin_user" msgid="1267225622818673274">"تمّ تسجيل الدخول كمشرف."</string>
     <string name="grant_admin_permissions_title" msgid="4628430467359951437">"جميع أذونات المشرفين"</string>
     <string name="grant_admin_permissions_button_text" msgid="988239414372882401">"منح المستخدم دور المشرف"</string>
-    <string name="grant_admin_permissions_message" msgid="1751910369004774830">"سيتمكن المستخدم من حذف حسابات المستخدمين، بما في ذلك حسابات المشرفين الآخرين، وإعادة ضبط النظام بحسب إعدادات المصنع."</string>
+    <string name="grant_admin_permissions_message" msgid="1751910369004774830">"سيتمكن المستخدم من حذف حسابات المستخدمين، بما في ذلك حسابات المشرفين الآخرين، وإعادة ضبط النظام على الإعدادات الأصلية."</string>
     <string name="action_not_reversible_message" msgid="740401337875726973">"لا يمكن التراجع عن هذا الإجراء."</string>
     <string name="confirm_grant_admin" msgid="7852596890218647682">"منح المستخدم دور المشرف"</string>
     <string name="create_user_permission_title" msgid="7781550880565935298">"إنشاء مستخدمين جدد"</string>
@@ -581,7 +578,7 @@
     <string name="lockpattern_pattern_wrong" msgid="929223969555399363">"نقش غير صحيح"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="4436556875843192284">"كيفية رسم نقش فتح القفل"</string>
     <string name="error_saving_lockpattern" msgid="2933512812768570130">"حدث خطأ أثناء حفظ النقش."</string>
-    <string name="okay" msgid="4589873324439764349">"موافق"</string>
+    <string name="okay" msgid="4589873324439764349">"حسنًا"</string>
     <string name="remove_screen_lock_title" msgid="1234382338764193387">"هل تريد إزالة قفل الشاشة؟"</string>
     <string name="remove_screen_lock_message" msgid="6675850371585564965">"سيؤدي هذا الإجراء إلى السماح لأي شخص بالدخول إلى حسابك."</string>
     <string name="lock_settings_enter_pin" msgid="1669172111244633904">"أدخل رقم التعريف الشخصي"</string>
@@ -679,7 +676,7 @@
     <string name="trusted_device_confirm_button" msgid="102354635014627996">"تأكيد"</string>
     <string name="trusted_device_remove_button" msgid="6140476996063415420">"إزالة الجهاز الموثوق به"</string>
     <string name="trusted_device_done_button" msgid="8481956533222625296">"تم"</string>
-    <string name="add_trusted_device_instruction" msgid="2280382609884918033">"استخدِم التطبيق المصاحب لإعداد جهاز موثوق به. بعد إعداد الجهاز، يتم إلغاء قفل الملف الشخصي للمستخدم تلقائيًا عند رصد هاتفك بالقرب من المركبة."</string>
+    <string name="add_trusted_device_instruction" msgid="2280382609884918033">"استخدِم التطبيق المصاحب لإعداد جهاز موثوق به. بعد إعداد الجهاز، يتم فتح قفل الملف الشخصي للمستخدم تلقائيًا عند رصد هاتفك بالقرب من المركبة."</string>
     <string name="trusted_device_download_app" msgid="6971096140154499983">"1. تنزيل التطبيق المصاحب على هاتفك"</string>
     <string name="trusted_device_select_device" msgid="198902765179270739">"2. اختيار <xliff:g id="CAR_NAME">%1$s</xliff:g> على هاتفك لإقران الأجهزة"</string>
     <string name="trusted_device_safety_alert" msgid="3834898922112046769">"يمكن لجهاز موثوق به قريب من سيارتك أن يلغي قفل الملف الشخصي للمستخدم عند تشغيل محركها، حتى وإن كان شخص غيرك يحمل الجهاز."</string>
@@ -688,6 +685,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"تعذّر تسجيل جهاز <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"سيتعيَّن عليك تحديد طريقة المصادقة بعد إضافة جهاز موثوق به. وإذا لم يكن بحوزتك جهازك الموثوق به، ستلزم المصادقة للوصول إلى ملفك الشخصي."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"تم قطع اتصال جهازك."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"محو بيانات الاعتماد"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"إزالة جميع الشهادات"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"هل تريد إزالة جميع المحتوى؟"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"تم مسح وحدة تخزين بيانات الاعتماد."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"تعذر محو وحدة تخزين بيانات الاعتماد."</string>
     <string name="forget" msgid="3971143908183848527">"حذف"</string>
     <string name="connect" msgid="5861699594602380150">"اتصال"</string>
     <string name="disconnect" msgid="6140789953324820336">"قطع اتصال"</string>
@@ -703,6 +705,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"سيؤدي هذا إلى حذف حساب العرض التوضيحي وإعادة الضبط بحسب بيانات المصنع على النظام. سيتم فقد جميع بيانات المستخدم."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"خروج من عرض توضيحي"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"رفض"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"لا تتوفَّر الميزة أثناء القيادة."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"لا يمكن إضافة مستخدم أثناء القيادة."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"لا تتوفَّر هذه الميزة أثناء القيادة."</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"لا يمكن إضافة مستخدم أثناء القيادة."</string>
 </resources>
diff --git a/res/values-as/config.xml b/res/values-as/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-as/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index ba24e37..fb8acd0 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"এই ব্যৱহাৰকাৰীজনৰ বাবে ইনষ্টল কৰা হোৱা নাই"</string>
     <string name="permissions_label" msgid="2701446753515612685">"অনুমতি"</string>
     <string name="notifications_label" msgid="6586089149665170731">"জাননী"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"ষ্ট’ৰেজ আৰু কেশ্ব"</string>
     <string name="application_version_label" msgid="8556889839783311649">"সংস্কৰণ: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"কোনো অনুমতি দিয়া হোৱা নাই"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"অনুমতি বিচৰা হোৱা নাই"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s অভ্যন্তৰীণ ষ্ট’ৰেজত আছে"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"ডেটাৰ ব্যৱহাৰ"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"এপ্ ডেটাৰ ব্যৱহাৰ"</string>
     <string name="computing_size" msgid="5791407621793083965">"গণনা কৰি থকা হৈছে…"</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"শেহতীয়া অৱস্থানৰ অনুৰোধ"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"শেহতীয়াকৈ কোনো এপে অৱস্থানৰ অনুৰোধ প্ৰেৰণ কৰা নাই"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"এপ্‌-স্তৰৰ অনুমতি"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"স্কেন কৰি থকা হৈছে…"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"অৱস্থান সেৱা"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"ৱাই-ফাই স্কেনিং"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"ব্লুটুথ অফ থকা অৱস্থাতো এপ্ আৰু সেৱাসমূহক যিকোনো সময়ত নিকটৱৰ্তী ডিভাইচবোৰ স্কেন কৰিবলৈ দিয়ক। ইয়াক অৱস্থান-নিৰ্ভৰ সুবিধা আৰু সেৱাসমূহ উন্নত কৰা আদি কাৰ্যত ব্যৱহাৰ কৰিব পাৰি।"</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"ব্লুটুথ স্কেনিং"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"ব্লুটুথ অফ থকা অৱস্থাতো এপ্ আৰু সেৱাসমূহক যিকোনো সময়ত নিকটৱৰ্তী ডিভাইচবোৰ স্কেন কৰিবলৈ দিয়ক। ইয়াক অৱস্থান-নিৰ্ভৰ সুবিধা আৰু সেৱাসমূহ উন্নত কৰা আদি কাৰ্যত ব্যৱহাৰ কৰিব পাৰি।"</string>
     <string name="system_setting_title" msgid="6864599341809463440">"ছিষ্টেম"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"ছিষ্টেম আপডে’ট"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Android সংস্কৰণ"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> যোৰা লগাব পৰা নগ’ল"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"আপুনি কোনো বিশ্বাসী ডিভাইচ যোগ কৰিলে তাৰ পিছত এটা বিশ্বাসযোগ্যতা প্ৰমাণীকৰণ পদ্ধতি ছেট কৰাৰ প্ৰয়োজন হ’ব। যদি বিশ্বাসী ডিভাইচটো আপোনাৰ সৈতে নাই তেন্তে আপোনাৰ প্ৰ’ফাইলটো এক্সেছ কৰিবলৈ বিশ্বাসযোগ্যতা প্ৰমাণীকৰণৰ প্ৰয়োজন হ’ব।"</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"ডিভাইচৰ সংযোগ বিচ্ছিন্ন কৰা হ’ল।"</string>
+    <string name="credentials_reset" msgid="873900550885788639">"ক্ৰেডেনশ্বিয়েল মচক"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"সকলো প্ৰমাণপত্ৰ আঁতৰাওক"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"সকলো সমল আঁতৰাবনে?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"ক্ৰেডেনশ্বিয়েল ষ্ট’ৰেজ মচা হ’ল।"</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"ক্ৰেডেনশ্বিয়েল ষ্ট’ৰেজ মচিব পৰা নগ’ল।"</string>
     <string name="forget" msgid="3971143908183848527">"পাহৰক"</string>
     <string name="connect" msgid="5861699594602380150">"সংযোগ কৰক"</string>
     <string name="disconnect" msgid="6140789953324820336">"সংযোগ বিচ্ছিন্ন কৰক"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"এই কামে ডেম\' একাউণ্টটো মচি পেলাব আৰু ছিষ্টেমটোৰ ফেক্টৰী ডেটা ৰিছেট কৰিব। সকলো ব্যৱহাৰকাৰীৰ ডেটা হেৰাব।"</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"ডেম\'ৰ পৰা বাহিৰ হওক"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"অগ্ৰাহ্য কৰক"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"ড্ৰাইভিং কৰা সময়ত এই সুবিধাটো নাথাকে।"</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"ড্ৰাইভিং কৰিথকা সময়ত ব্য়ৱহাৰকাৰী যোগ কৰিব নোৱাৰি।"</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"গাড়ী চলাই থকা সময়ত এই সুবিধাটো উপলব্ধ নহয়"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"গাড়ী চলাই থকা সময়ত ব্য়ৱহাৰকাৰীক যোগ কৰিব নোৱাৰি"</string>
 </resources>
diff --git a/res/values-az/config.xml b/res/values-az/config.xml
new file mode 100644
index 0000000..0b020b7
--- /dev/null
+++ b/res/values-az/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"məzmun://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"məzmun://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 25512ce..7dc20de 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"Bu istifadəçi üçün quraşdırılmayıb"</string>
     <string name="permissions_label" msgid="2701446753515612685">"İcazələr"</string>
     <string name="notifications_label" msgid="6586089149665170731">"Bildirişlər"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"Yaddaş və keş"</string>
     <string name="application_version_label" msgid="8556889839783311649">"Versiya: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"İcazə verilməyib"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"İcazə sorğusu göndərilməyib"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"Daxili yaddaşda %s"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"Data istifadəsi"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"Tətbiq data istifadəsi"</string>
     <string name="computing_size" msgid="5791407621793083965">"Hesablanır…"</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"Son Məkan Sorğuları"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"Məkan sorğusu yoxdur"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"Tətbiq səviyyəsi icazələri"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"Skan edilir"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"Məkan Xidmətləri"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Wi-Fi skan edilir"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Wi‑Fi deaktiv olsa belə, tətbiq və xidmətlərin Wi‑Fi şəbəkələrini istənilən zaman skan etməsinə icazə verin. Məsələn, bu, məkanla bağlı xüsusiyyət və xidmətləri təkmilləşdirmək üçün istifadə edilə bilər."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"Bluetooth skan edilir"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"Bluetooth deaktiv olsa belə, tətbiq və xidmətlərə yaxınlıqdakı cihazları istənilən zaman skan etməsinə icazə verin. Məsələn, bu, məkanla bağlı xüsusiyyət və xidmətləri təkmilləşdirmək üçün istifadə edilə bilər."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"Sistem"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"Sistem yenilənməsi"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Android versiyası"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> qeydiyyatı alınmadı"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"Etibarlı cihaz əlavə etdikdən sonra doğrulama metodu təyin edilməlidir. Etibarlı cihazınız üzərinizdə deyilsə, profilinizə giriş üçün doğrulama tələb olunacaq."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"Cihaz qoşulmayıb."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"Giriş məlumatlarını silin"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"Bütün sertifikatları silin"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"Bütün məzmun silinsin?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"Giriş məlumatları yaddaşı silindi."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"Giriş məlumatları yaddaşını silmək mümkün olmadı."</string>
     <string name="forget" msgid="3971143908183848527">"Unudun"</string>
     <string name="connect" msgid="5861699594602380150">"Qoşun"</string>
     <string name="disconnect" msgid="6140789953324820336">"Ayırın"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Bu, demo hesabı siləcək və sistemi istehsalçı nizamlarına qaytaracaq."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Demodan çıxın"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"RƏDD EDİN"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"Xüsusiyyət avtomobil idarə edərkən əlçatan deyil."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"Avtomobil idarə edərkən istifadəçi əlavə etmək mümkün deyil."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"Funksiya avtomobil idarə edərkən əlçatan deyil"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"Avtomobil idarə edərkən istifadəçi əlavə etmək mümkün deyil"</string>
 </resources>
diff --git a/res/values-b+sr+Latn/config.xml b/res/values-b+sr+Latn/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-b+sr+Latn/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 1e8f6e0..b5f0ca8 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -285,9 +285,11 @@
     <string name="not_installed" msgid="4218816013370552746">"Nije instalirano za ovog korisnika"</string>
     <string name="permissions_label" msgid="2701446753515612685">"Dozvole"</string>
     <string name="notifications_label" msgid="6586089149665170731">"Obaveštenja"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"Memorijski prostor i keš"</string>
     <string name="application_version_label" msgid="8556889839783311649">"Verzija: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"Nijedna dozvola nije odobrena"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"Nijedna dozvola nije zahtevana"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s u internoj memoriji"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"Potrošnja podataka"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"Potrošnja podataka apl."</string>
     <string name="computing_size" msgid="5791407621793083965">"Izračunava se..."</string>
@@ -347,12 +349,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"Nedavni zahtevi za lokaciju"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"Nema nedavnih zahteva za lokaciju"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"Dozvole na nivou aplikacija"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"Skeniranje"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"Usluge lokacije"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Wi‑Fi skeniranje"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Dozvolite aplikacijama i uslugama da traže Wi‑Fi mreže u bilo kom trenutku, čak i kada je Wi‑Fi isključen. Ovo može da se koristi, na primer, za poboljšanje funkcija i usluga zasnovanih na lokaciji."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"Bluetooth skeniranje"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"Dozvolite aplikacijama i uslugama da traže uređaje u blizini u svakom trenutku, čak i kada je Bluetooth isključen. Ovo može da se koristi, na primer, za poboljšanje funkcija i usluga zasnovanih na lokaciji."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"Sistem"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"Ažuriranja sistema"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Verzija Android-a"</string>
@@ -652,6 +649,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"Registracija uređaja <xliff:g id="DEVICE_NAME">%1$s</xliff:g> nije uspela"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"Za dodavanje pouzdanog uređaja sledeće što treba da uradite je da podesite metod potvrde identiteta. Ako nemate pouzdani uređaj sa sobom, potvrda identiteta će biti potrebna da biste pristupili profilu."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"Prekinuta je veza sa uređajem."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"Obriši akreditive"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"Uklonite sve sertifikate"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"Želite li da uklonite sav sadržaj?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"Skladište akreditiva je obrisano."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"Brisanje skladišta akreditiva nije uspelo."</string>
     <string name="forget" msgid="3971143908183848527">"Zaboravi"</string>
     <string name="connect" msgid="5861699594602380150">"Poveži"</string>
     <string name="disconnect" msgid="6140789953324820336">"Prekini vezu"</string>
@@ -667,6 +669,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Ovim ćete izbrisati nalog za demonstracije i resetovati sistem na fabrička podešavanja. Svi podaci korisnika će biti izgubljeni."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Napusti režim demonstr."</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"ODBACI"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"Funkcija nije dostupna tokom vožnje."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"Ne možete da dodate korisnika tokom vožnje."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"Funkcija nije dostupna tokom vožnje"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"Ne možete da dodajete korisnike tokom vožnje"</string>
 </resources>
diff --git a/res/values-be/config.xml b/res/values-be/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-be/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index cc1096c..f9bef04 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -287,9 +287,11 @@
     <string name="not_installed" msgid="4218816013370552746">"Не ўсталявана для гэтага карыстальніка"</string>
     <string name="permissions_label" msgid="2701446753515612685">"Дазволы"</string>
     <string name="notifications_label" msgid="6586089149665170731">"Апавяшчэнні"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"Сховішча і кэш"</string>
     <string name="application_version_label" msgid="8556889839783311649">"Версія: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"Няма дазволаў"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"Няма запытаў на дазволы"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s ва ўнутраным сховішчы"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"Выкарыстанне трафіка"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"Выкарыстанне трафіка"</string>
     <string name="computing_size" msgid="5791407621793083965">"Вылічэнне…"</string>
@@ -350,12 +352,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"Нядаўнія запыты геаданых"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"Няма нядаўніх запытаў геаданых"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"Дазволы на ўзроўні праграм"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"Сканіраванне"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"Службы геалакацыі"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Пошук сетак Wi-Fi"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Дазвольце праграмам і сэрвісам шукаць сеткі Wi‑Fi, нават калі Wi‑Fi не падключаны. Гэта можна выкарыстоўваць, напрыклад, для паляпшэння функцый і сэрвісаў, якія выкарыстоўваюць геалакацыю."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"Пошук прылад Bluetooth"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"Дазвольце праграмам і сэрвісам шукаць прылады паблізу, нават калі Bluetooth выключаны. Гэта можна выкарыстоўваць, напрыклад, для паляпшэння функцый і сэрвісаў, якія выкарыстоўваюць геалакацыю."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"Сістэма"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"Абнаўленне сістэмы"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Версія Android"</string>
@@ -664,6 +661,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"Не ўдалося зарэгістраваць прыладу \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\""</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"Для дадавання даверанай прылады неабходна задаць спосаб аўтэнтыфікацыі. Ён спатрэбіцца для атрымання доступу да вашага профілю, калі давераная прылада не з вамі."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"Прылада адключана."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"Выдаліць уліковыя даныя"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"Выдаліць усе сертыфікаты"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"Выдаліць усё змесціва?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"Уліковыя даныя ў сховішчы сцёрты."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"Не ўдалося сцерці ўліковыя даныя ў сховішчы."</string>
     <string name="forget" msgid="3971143908183848527">"Забыць"</string>
     <string name="connect" msgid="5861699594602380150">"Падключыцца"</string>
     <string name="disconnect" msgid="6140789953324820336">"Адключыцца"</string>
@@ -679,6 +681,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Адбудзецца скід сістэмы да заводскіх налад. Тэставы ўліковы запіс і ўсе карыстальніцкія даныя будуць выдалены."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Выйсці з дэма-рэжыму"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"АДХІЛІЦЬ"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"Функцыя недаступная, калі вы за рулём."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"Нельга дадаць карыстальніка, калі аўтамабіль рухаецца."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"Функцыя недаступная, калі аўтамабіль рухаецца"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"Нельга дадаць карыстальніка, калі аўтамабіль рухаецца"</string>
 </resources>
diff --git a/res/values-bg/config.xml b/res/values-bg/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-bg/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index bc6a5a8..866a353 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"Не е инсталирано за този потребител"</string>
     <string name="permissions_label" msgid="2701446753515612685">"Разрешения"</string>
     <string name="notifications_label" msgid="6586089149665170731">"Известия"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"Хранилище и кеш"</string>
     <string name="application_version_label" msgid="8556889839783311649">"Версия: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"Няма предоставени разрешения"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"Няма заявени разрешения"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s във вътрешното хранилище"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"Пренос на данни"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"Прилож.: Пренос на данни"</string>
     <string name="computing_size" msgid="5791407621793083965">"Изчислява се…"</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"Скорошни заявки за местоположението"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"Няма скорошни заявки за местоположението"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"Разрешения на ниво приложение"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"Сканиране"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"Услуги за местоположение"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Сканиране за Wi‑Fi"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Разрешете на приложенията и услугите да сканират за Wi‑Fi мрежи по всяко време дори когато функцията за Wi‑Fi e изключена. Това може да послужи например за подобряване на базиращите се на местоположението функции и услуги."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"Сканиране за устройства с Bluetooth"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"Разрешете на приложенията и услугите да сканират за устройства в близост по всяко време дори когато функцията за Bluetooth e изключена. Това може да послужи например за подобряване на базиращите се на местоположението функции и услуги."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"Система"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"Системни актуализации"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Версия на Android"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"Регистрацията на <xliff:g id="DEVICE_NAME">%1$s</xliff:g> не бе успешна"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"За добавянето на надеждно устройство се изисква да зададете метод на удостоверяване на следващия екран. Ако надеждното ви устройство не е у вас, удостоверяването ще се изисква за достъп до потребителския ви профил."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"Връзката с устройството е прекъсната."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"Изчистване на идентификационните данни"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"Премахване на всички сертификати"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"Да се премахне ли цялото съдържание?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"Идентификационните данни са изтрити."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"Хранилището за идент. данни не можа да бъде изтрито."</string>
     <string name="forget" msgid="3971143908183848527">"Забравяне"</string>
     <string name="connect" msgid="5861699594602380150">"Свързване"</string>
     <string name="disconnect" msgid="6140789953324820336">"Прекрат. на връзката"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Това действие ще изтрие демонстрационния профил и ще възстанови фабричните настройки на системата. Всички потребителски данни ще бъдат изгубени."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Демонстр. режим: Изход"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"ОТХВЪРЛЯНЕ"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"Функцията не е налице по време на шофиране."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"Потребителят не може да се добави по време на шофиране."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"Функцията не е налице по време на шофиране"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"Потребителят не може да се добави по време на шофиране"</string>
 </resources>
diff --git a/res/values-bn/config.xml b/res/values-bn/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-bn/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index f674391..705bdba 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -21,7 +21,7 @@
     <string name="more_settings_label" msgid="3867559443480110616">"আরও"</string>
     <string name="display_settings" msgid="5325515247739279185">"ডিসপ্লে"</string>
     <string name="brightness" msgid="2919605130898772866">"উজ্জ্বলতার স্তর"</string>
-    <string name="auto_brightness_title" msgid="9124647862844666581">"পরিবেশের আলো অনুসারে উজ্জ্বলতা"</string>
+    <string name="auto_brightness_title" msgid="9124647862844666581">"অভিযোজিত উজ্জ্বলতা"</string>
     <string name="auto_brightness_summary" msgid="4741887033140384352">"উপলভ্য আলোর পরিপ্রেক্ষিতে উজ্জ্বলতার স্তর অপ্টিমাইজ করুন"</string>
     <string name="condition_night_display_title" msgid="3777509730126972675">"নাইট লাইট চালু আছে"</string>
     <string name="keywords_display" msgid="3978416985146943922">"স্ক্রিন, টাচস্ক্রিন"</string>
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"এই ব্যবহারকারীর জন্য ইনস্টল করা নেই"</string>
     <string name="permissions_label" msgid="2701446753515612685">"অনুমতিগুলি"</string>
     <string name="notifications_label" msgid="6586089149665170731">"বিজ্ঞপ্তি"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"স্টোরেজ ও ক্যাশে"</string>
     <string name="application_version_label" msgid="8556889839783311649">"ভার্সন: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"কোনও অনুমতি দেওয়া হয় নি"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"কোনও অনুমতির অনুরোধ জানানো হয়নি"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"ইন্টারনাল স্টোরেজে %s রয়েছে"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"ডেটা ব্যবহার"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"অ্যাপ ডেটার ব্যবহার"</string>
     <string name="computing_size" msgid="5791407621793083965">"কম্পিউটিং..."</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"সাম্প্রতিক লোকেশনের অনুরোধ"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"কোনও সাম্প্রতিক লোকেশনের অনুরোধ নেই"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"অ্যাপ-লেবেল অনুমতি"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"স্ক্যান করা হচ্ছে"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"লোকেশন পরিষেবা"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"ওয়াই-ফাই স্ক্যানিং"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"ব্লুটুথ বন্ধ থাকলেও অ্যাপ এবং পরিষেবাগুলিকে যেকোনও সময় ওয়াই-ফাই নেটওয়ার্ক স্ক্যান করার অনুমতি দিন। এটি বিভিন্ন ক্ষেত্রে কাজে লাগতে পারে, যেমন লোকেশন-ভিত্তিক বৈশিষ্ট্য এবং পরিষেবার উন্নতির জন্য।"</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"ব্লুটুথ স্ক্যানিং"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"ব্লুটুথ বন্ধ থাকলেও অ্যাপ এবং পরিষেবাগুলিকে যেকোনও সময় আশেপাশে থাকা অন্যান্য ডিভাইস স্ক্যান করার অনুমতি দিন। এটি বিভিন্ন ক্ষেত্রে কাজে লাগতে পারে, যেমন লোকেশন-ভিত্তিক বৈশিষ্ট্য এবং পরিষেবার উন্নতির জন্য।"</string>
     <string name="system_setting_title" msgid="6864599341809463440">"সিস্টেম"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"সিস্টেম আপডেট"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Android ভার্সন"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> নথিভুক্ত করা যায়নি"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"একটি বিশ্বস্ত ডিভাইস যোগ করার পর যাচাইকরণ পদ্ধতি সেট করতে হবে। যদি আপনার বিশ্বস্ত ডিভাইস হাতের কাছে না থাকে তাহলে আপনার প্রোফাইল অ্যাক্সেস করার জন্য যাচাইকরণ করা প্রয়োজন।"</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"ডিভাইস ডিসকানেক্ট করা হয়েছে।"</string>
+    <string name="credentials_reset" msgid="873900550885788639">"ক্রেডেনশিয়াল মুছে ফেলুন"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"সব সার্টিফিকেট সরান"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"সমস্ত কন্টেন্ট সরাতে চান?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"ক্রেডেনশিয়াল স্টোরেজ মুছে ফেলা হয়েছে।"</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"ক্রেডেনশিয়াল স্টোরেজ মোছা যাবে না।"</string>
     <string name="forget" msgid="3971143908183848527">"ভুলে যান"</string>
     <string name="connect" msgid="5861699594602380150">"কানেক্ট করুন"</string>
     <string name="disconnect" msgid="6140789953324820336">"ডিসকানেক্ট করুন"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"এর ফলে ডেমো অ্যাকাউন্টটি মুছে দেওয়া হবে এবং সিস্টেমের ডেটা ফ্যাক্টরি রিসেট করা হবে। ব্যবহারকারীর সমস্ত ডেটা মুছে যাবে।"</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"ডেমো মোড ছেড়ে যান"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"খারিজ করুন"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"ড্রাইভ করার সময় এই বৈশিষ্ট্য উপলভ্য নয়।"</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"ড্রাইভ করার সময় ব্যবহারকারীকে যোগ করতে পারবেন না।"</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"ড্রাইভ করার সময় এই ফিচার কাজ করবে না"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"ড্রাইভ করার সময় ব্যবহারকারীকে যোগ করতে পারবেন না"</string>
 </resources>
diff --git a/res/values-bs/config.xml b/res/values-bs/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-bs/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 746f1c2..958a326 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -285,9 +285,11 @@
     <string name="not_installed" msgid="4218816013370552746">"Nije instalirano za ovog korisnika"</string>
     <string name="permissions_label" msgid="2701446753515612685">"Odobrenja"</string>
     <string name="notifications_label" msgid="6586089149665170731">"Obavještenja"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"Pohrana i keš memorija"</string>
     <string name="application_version_label" msgid="8556889839783311649">"Verzija: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"Nema dodijeljenih odobrenja"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"Nema zatraženih odobrenja"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s u unutrašnjoj memoriji"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"Prijenos podataka"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"Prijenos podataka za apl."</string>
     <string name="computing_size" msgid="5791407621793083965">"Računanje…"</string>
@@ -347,12 +349,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"Nedavni zahtjevi za lokaciju"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"Nema nedavnih zahtjeva za lokaciju"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"Odobrenja na nivou aplikacija"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"Skeniranje"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"Usluge lokacije"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Skeniranje Wi‑Fi mreže"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Dozvolite aplikacijama i uslugama skeniranje WiFi mreže u svakom trenutku, čak i kada je WiFi mreža isključena. Ovim se, naprimjer, mogu poboljšati funkcije i usluge zasnovane na lokaciji."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"Skeniranje Bluetootha"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"Dozvolite aplikacijama i uslugama skeniranje uređaja u blizini u svakom trenutku, čak i kada je Bluetooth isključen. Ovim se, naprimjer, mogu poboljšati funkcije i usluge zasnovane na lokaciji."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"Sistem"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"Ažuriranja sistema"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Verzija Androida"</string>
@@ -652,6 +649,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"Prijava uređaja <xliff:g id="DEVICE_NAME">%1$s</xliff:g> nije uspjela"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"Nakon što dodate pouzdani uređaj, morate postaviti metodu autentifikacije. Autentifikacija će biti potrebna za pristup profilu u slučaju da kod sebe nemate pouzdani uređaj."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"Veza s uređajem je prekinuta."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"Brisanje akreditiva"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"Uklanjanje svih certifikata"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"Ukloniti sav sadržaj?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"Pohrana akreditiva je izbrisana."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"Brisanje pohrane akreditiva nije uspjelo."</string>
     <string name="forget" msgid="3971143908183848527">"Zaboravi"</string>
     <string name="connect" msgid="5861699594602380150">"Poveži"</string>
     <string name="disconnect" msgid="6140789953324820336">"Prekini vezu"</string>
@@ -667,6 +669,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Ovim će se izbrisati račun za demonstraciju i vratiti sistem na fabričke postavke. Svi korisnički podaci bit će izgubljeni."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Izađite iz demonstr."</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"ODBACI"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"Funkcija nije dostupna tokom vožnje."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"Nije moguće dodati korisnika za vrijeme vožnje."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"Funkcija nije dostupna tokom vožnje"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"Nije moguće dodati korisnika za vrijeme vožnje"</string>
 </resources>
diff --git a/res/values-ca/config.xml b/res/values-ca/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-ca/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index da85894..de8fccf 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"No instal·lada per a l\'usuari"</string>
     <string name="permissions_label" msgid="2701446753515612685">"Permisos"</string>
     <string name="notifications_label" msgid="6586089149665170731">"Notificacions"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"Emmagatzematge i memòria cau"</string>
     <string name="application_version_label" msgid="8556889839783311649">"Versió: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"No s\'ha concedit cap permís"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"No s\'ha sol·licitat cap permís"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s a l\'emmagatzematge intern"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"Ús de dades"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"Ús de dades de l\'aplicació"</string>
     <string name="computing_size" msgid="5791407621793083965">"S\'està calculant…"</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"Sol·licituds d\'ubicació recents"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"No hi ha cap sol·licitud d\'ubicació recent"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"Permisos al nivell de l\'aplicació"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"Cerca"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"Serveis d\'ubicació"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Cerca de xarxes Wi‑Fi"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Permet que les aplicacions i els serveis cerquin xarxes Wi‑Fi en qualsevol moment, fins i tot quan la Wi‑Fi estigui desactivada. Aquesta opció es pot utilitzar, per exemple, per millorar les funcions i els serveis basats en la ubicació."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"Cerca de dispositius Bluetooth"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"Permet que les aplicacions i els serveis cerquin dispositius propers en qualsevol moment, fins i tot quan el Bluetooth estigui desactivat. Es pot utilitzar, per exemple, per millorar les funcions i els serveis basats en la ubicació."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"Sistema"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"Actualitzacions del sistema"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Versió d\'Android"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"No s\'ha pogut inscriure el dispositiu <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"Per afegir un dispositiu de confiança, cal que defineixis un mètode d\'autenticació a continuació. Si no tens a mà el dispositiu de confiança, caldrà que utilitzis el mètode d\'autenticació per accedir al perfil."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"S\'ha desconnectat el dispositiu."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"Esborrar les credencials"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"Suprimeix tots els certificats"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"Vols suprimir tots els continguts?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"S\'ha esborrat l\'emmagatzematge de credencials."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"No s\'ha pogut esborrar l\'emmagatzematge de credencials."</string>
     <string name="forget" msgid="3971143908183848527">"Oblida"</string>
     <string name="connect" msgid="5861699594602380150">"Connecta"</string>
     <string name="disconnect" msgid="6140789953324820336">"Desconnecta"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Aquesta acció suprimirà el compte de demostració i es restabliran les dades de fàbrica del sistema. Es perdran totes les dades d\'usuari."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Surt de la demostració"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"IGNORA"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"Aquesta funció no està disponible mentre condueixes."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"No pots afegir usuaris mentre condueixes."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"Aquesta funció no està disponible mentre condueixes"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"No pots afegir usuaris mentre condueixes"</string>
 </resources>
diff --git a/res/values-cs/config.xml b/res/values-cs/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-cs/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index dab1770..5429527 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -287,9 +287,11 @@
     <string name="not_installed" msgid="4218816013370552746">"Pro tohoto uživatele nenainstalováno"</string>
     <string name="permissions_label" msgid="2701446753515612685">"Oprávnění"</string>
     <string name="notifications_label" msgid="6586089149665170731">"Oznámení"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"Úložiště a mezipaměť"</string>
     <string name="application_version_label" msgid="8556889839783311649">"Verze: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"Nebyla udělena žádná oprávnění"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"Nevyžaduje žádná oprávnění"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s v interním úložišti"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"Využití dat"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"Využití dat aplikací"</string>
     <string name="computing_size" msgid="5791407621793083965">"Probíhá výpočet…"</string>
@@ -350,12 +352,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"Nedávné žádosti o určení polohy"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"Žádné nedávné žádosti o určení polohy"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"Oprávnění na úrovni aplikace"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"Vyhledávání"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"Služby určování polohy"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Vyhledávání Wi‑Fi"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Povolit aplikacím a službám vyhledávat sítě Wi‑Fi, i když je připojení k sítím Wi‑Fi vypnuté. Tuto funkci lze využít například ke zlepšení funkcí a služeb založených na poloze."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"Vyhledávání Bluetooth"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"Povolit aplikacím a službám vyhledávat zařízení v okolí kdykoliv, i když je rozhraní Bluetooth vypnuté. Tuto funkci lze využít například ke zlepšení funkcí a služeb založených na poloze."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"Systém"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"Aktualizace systému"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Verze systému Android"</string>
@@ -664,6 +661,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"Registrace zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g> se nezdařila"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"Když přidáte důvěryhodné zařízení, bude nutné následně nastavit metodu ověření. Pokud důvěryhodné zařízení nemáte u sebe, před zobrazení profilu bude nutné provést ověření."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"Zařízení bylo odpojeno."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"Vymazat pověření"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"Odstranit všechny certifikáty"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"Odstranit veškerý obsah?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"Úložiště pověření je vymazáno."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"Úložiště pověření nelze smazat."</string>
     <string name="forget" msgid="3971143908183848527">"Odstranit"</string>
     <string name="connect" msgid="5861699594602380150">"Připojit"</string>
     <string name="disconnect" msgid="6140789953324820336">"Odpojit"</string>
@@ -679,6 +681,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Ukázkový účet bude smazán a systém se resetuje do továrního nastavení. Všechna uživatelská data budou ztracena."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Ukončit ukázku"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"ZAVŘÍT"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"Funkce při řízení není dostupná."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"Při řízení nelze přidat uživatele."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"Funkce při řízení není dostupná"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"Při řízení nelze přidat uživatele"</string>
 </resources>
diff --git a/res/values-da/config.xml b/res/values-da/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-da/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index f1a2b87..f314cf5 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"Ikke installeret for denne bruger"</string>
     <string name="permissions_label" msgid="2701446753515612685">"Tilladelser"</string>
     <string name="notifications_label" msgid="6586089149665170731">"Notifikationer"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"Lagerplads og cache"</string>
     <string name="application_version_label" msgid="8556889839783311649">"Version %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"Der er ikke givet nogen tilladelser"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"Der er ikke anmodet om nogen tilladelser"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s i intern lagerplads"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"Dataforbrug"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"Dataforbrug i apps"</string>
     <string name="computing_size" msgid="5791407621793083965">"Beregner…"</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"Seneste placeringsanmodninger"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"Der er ingen seneste placeringsanmodninger"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"Tilladelser på appniveau"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"Scanning"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"Placeringstjenester"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Wi-Fi-scanning"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Tillad, at apps og tjenester altid kan søge efter Wi-Fi-netværk, også selvom Wi-Fi er deaktiveret. Dette kan f.eks. bruges til at forbedre stedbaserede funktioner og tjenester."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"Bluetooth-scanning"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"Tillad, at apps og tjenester altid kan søge efter enheder i nærheden, også selvom Bluetooth er deaktiveret. Dette kan f.eks. bruges til at forbedre stedbaserede funktioner og tjenester."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"System"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"Systemopdateringer"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Android-version"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"Tilmeldingen af <xliff:g id="DEVICE_NAME">%1$s</xliff:g> mislykkedes"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"Hvis du vil tilføje en godkendt enhed, skal du først angive en godkendelsesmetode. Hvis du ikke har din godkendte enhed med dig, kræves der godkendelse, før du kan få adgang til din profil."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"Forbindelsen til enheden blev afbrudt."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"Ryd loginoplysninger"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"Fjern alle certifikater"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"Vil du fjerne alt indhold?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"Lager for loginoplysninger er slettet."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"Lager for loginoplysninger kunne ikke slettes."</string>
     <string name="forget" msgid="3971143908183848527">"Glem"</string>
     <string name="connect" msgid="5861699594602380150">"Opret forbindelse"</string>
     <string name="disconnect" msgid="6140789953324820336">"Afbryd forbindelse"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Denne handling sletter demokontoen og gendanner systemets fabriksdata. Du mister alle brugerdata."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Luk demotilstand"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"AFVIS"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"Funktionen er ikke tilgængelig under kørsel."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"Du kan ikke tilføje brugere under kørsel."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"Funktionen er ikke tilgængelig, mens du kører"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"Du kan ikke tilføje brugere, mens du kører"</string>
 </resources>
diff --git a/res/values-de/config.xml b/res/values-de/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-de/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 45eb837..1081059 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"Nicht für diesen Nutzer installiert"</string>
     <string name="permissions_label" msgid="2701446753515612685">"Berechtigungen"</string>
     <string name="notifications_label" msgid="6586089149665170731">"Benachrichtigungen"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"Speicher und Cache"</string>
     <string name="application_version_label" msgid="8556889839783311649">"Version: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"Keine Berechtigungen gewährt"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"Keine Berechtigungen angefordert"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s in internem Speicher"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"Datennutzung"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"Datenverbrauch durch Apps"</string>
     <string name="computing_size" msgid="5791407621793083965">"Berechnung läuft…"</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"Letzte Standortanfragen"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"Keine letzten Standortanfragen"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"Berechtigungen auf App-Ebene"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"Suche"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"Standortdienste"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"WLAN-Suche"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Apps und Dienste dürfen immer nach WLANs suchen, auch wenn die WLAN-Funktion deaktiviert ist. Dadurch können beispielsweise standortbasierte Funktionen und Dienste verbessert werden."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"Bluetooth-Suche"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"Apps und Dienste dürfen immer nach Geräten in der Nähe suchen, auch wenn Bluetooth deaktiviert ist. Dadurch können beispielsweise standortbasierte Funktionen und Dienste verbessert werden."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"System"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"Systemupdates"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Android-Version"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"Anmeldung von <xliff:g id="DEVICE_NAME">%1$s</xliff:g> fehlgeschlagen"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"Wenn du ein vertrauenswürdiges Gerät hinzufügst, musst du danach eine Authentifizierungsmethode festlegen. Diese wird benötigt, um auf dein Konto zuzugreifen, wenn du dein vertrauenswürdiges Gerät nicht dabei hast."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"Gerät getrennt."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"Anmeldedaten löschen"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"Alle Zertifikate entfernen"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"Alle Inhalte entfernen?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"Anmeldedatenspeicher wurde gelöscht."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"Anmeldedatenspeicher konnte nicht gelöscht werden."</string>
     <string name="forget" msgid="3971143908183848527">"Entfernen"</string>
     <string name="connect" msgid="5861699594602380150">"Verbinden"</string>
     <string name="disconnect" msgid="6140789953324820336">"Trennen"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Dadurch wird das Demokonto gelöscht und das System auf die Werkseinstellungen zurückgesetzt. Dabei gehen alle Nutzerdaten verloren."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Demo beenden"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"SCHLIEẞEN"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"Funktion während der Fahrt nicht verfügbar."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"Während der Fahrt kann kein Nutzer hinzugefügt werden."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"Funktion während der Fahrt nicht verfügbar"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"Während der Fahrt kann kein Nutzer hinzugefügt werden"</string>
 </resources>
diff --git a/res/values-el/config.xml b/res/values-el/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-el/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 830c7cf..a18be72 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"Δεν εγκαταστάθηκε για αυτόν τον χρήστη"</string>
     <string name="permissions_label" msgid="2701446753515612685">"Δικαιώματα"</string>
     <string name="notifications_label" msgid="6586089149665170731">"Ειδοποιήσεις"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"Αποθηκευτικός χώρος και κρυφή μνήμη"</string>
     <string name="application_version_label" msgid="8556889839783311649">"Έκδοση: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"Δεν έχουν εκχωρηθεί δικαιώματα"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"Δεν ζητήθηκαν δικαιώματα"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s εσωτερικού αποθηκευτικού χώρου"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"Χρήση δεδομένων"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"Χρήση δεδομένων εφαρμογών"</string>
     <string name="computing_size" msgid="5791407621793083965">"Υπολογισμός…"</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"Πρόσφατα αιτήματα τοποθεσίας"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"Δεν υπάρχουν πρόσφατα αιτήματα τοποθεσίας"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"Άδειες επιπέδου εφαρμογής"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"Σάρωση"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"Υπηρεσίες τοποθεσίας"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Σάρωση Wi-Fi"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Επιτρέψτε σε εφαρμογές και υπηρεσίες να εκτελούν σάρωση για δίκτυα Wi‑Fi, ακόμα και όταν το Wi‑Fi είναι ανενεργό. Η σάρωση μπορεί να χρησιμοποιηθεί, για παράδειγμα, για τη βελτίωση λειτουργιών και υπηρεσιών που εκτελούνται βάσει τοποθεσίας."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"Σάρωση Bluetooth"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"Επιτρέψτε σε εφαρμογές/υπηρεσίες να κάνουν σάρωση για κοντινές συσκευές, ακόμα και όταν το Bluetooth είναι ανενεργό. Η σάρωση μπορεί να χρησιμοποιηθεί, για παράδειγμα, για τη βελτίωση λειτουργιών/υπηρεσιών που εκτελούνται βάσει τοποθεσίας."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"Σύστημα"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"Ενημερώσεις συστήματος"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Έκδοση Android"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"Η εγγραφή της συσκευής <xliff:g id="DEVICE_NAME">%1$s</xliff:g> απέτυχε"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"Η προσθήκη αξιόπιστης συσκευής απαιτεί να ορίσετε στη συνέχεια μια μέθοδο ελέγχου ταυτότητας. Εάν δεν έχετε μαζί σας την αξιόπιστη συσκευή σας, θα ζητηθεί έλεγχος ταυτότητας για την πρόσβαση στο προφίλ σας."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"Η συσκευή αποσυνδέθηκε."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"Διαγραφή διαπιστευτηρίων"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"Κατάργηση όλων των πιστοποιητικών"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"Να καταργηθεί όλο το περιεχόμενο;"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"Ο αποθηκευτικός χώρος διαπιστευτηρίων διαγράφηκε."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"Αδύνατη η διαγραφή του αποθηκευτικού χώρου διαπιστευτηρίων."</string>
     <string name="forget" msgid="3971143908183848527">"Διαγραφή από μνήμη"</string>
     <string name="connect" msgid="5861699594602380150">"Σύνδεση"</string>
     <string name="disconnect" msgid="6140789953324820336">"Αποσύνδεση"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Με αυτόν τον τρόπο, ο λογαριασμός επίδειξης θα χαθεί και θα γίνει επαναφορά των εργοστασιακών δεδομένων συστήματος. Όλα τα δεδομένα χρήστη θα χαθούν."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Έξοδος από επίδειξη"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"ΠΑΡΑΒΛΕΨΗ"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"Η λειτουργία δεν διατίθεται κατά τη διάρκεια της οδήγησης."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"Δεν είναι δυνατή η προσθήκη χρήστη κατά την οδήγηση."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"Η λειτουργία δεν διατίθεται κατά τη διάρκεια της οδήγησης."</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"Δεν είναι δυνατή η προσθήκη χρήστη κατά την οδήγηση."</string>
 </resources>
diff --git a/res/values-en-rAU/config.xml b/res/values-en-rAU/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-en-rAU/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index c68531b..f9b7317 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -29,7 +29,7 @@
     <string name="keywords_display_auto_brightness" msgid="2700310050333468752">"dim screen, touchscreen, battery"</string>
     <string name="keywords_display_night_display" msgid="2922294576679769957">"dim screen, night, tint"</string>
     <string name="night_mode_tile_label" msgid="6603597795502131664">"Night mode"</string>
-    <string name="network_and_internet" msgid="4229023630498537530">"Network &amp; internet"</string>
+    <string name="network_and_internet" msgid="4229023630498537530">"Network and internet"</string>
     <string name="mobile_network_settings" msgid="1708621113321368597">"Mobile network"</string>
     <plurals name="mobile_network_summary_count" formatted="false" msgid="6917348330386831454">
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> SIMs</item>
@@ -151,7 +151,7 @@
     <string name="wifi_ap_2G" msgid="5364135697314262014">"2.4 GHz"</string>
     <string name="wifi_ap_5G" msgid="4945574428537860279">"5.0 GHz"</string>
     <string name="wifi_ap_band_select_one" msgid="615578175244067396">"Choose at least one band for Wi‑Fi hotspot:"</string>
-    <string name="tether_settings_title_all" msgid="4663704772599383169">"Hotspot &amp; tethering"</string>
+    <string name="tether_settings_title_all" msgid="4663704772599383169">"Hotspot and tethering"</string>
     <string name="wifi_hotspot_auto_off_title" msgid="7871858619924599922">"Turn off hotspot automatically"</string>
     <string name="wifi_hotspot_auto_off_summary" msgid="4830341947541735136">"Wi‑Fi hotspot will turn off if no devices are connected"</string>
     <string name="wifi_ask_enable" msgid="4452418245680754578">"<xliff:g id="REQUESTER">%s</xliff:g> wants to turn on Wi-Fi"</string>
@@ -198,7 +198,7 @@
     <string name="bluetooth_notif_message" msgid="1060821000510108726">"Tap to pair with <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_device_picker" msgid="673238198452345475">"Choose Bluetooth device"</string>
     <string name="language_settings" msgid="2079258598337245546">"Languages"</string>
-    <string name="languages_and_input_settings" msgid="3672322610529408248">"Languages &amp; input"</string>
+    <string name="languages_and_input_settings" msgid="3672322610529408248">"Languages and input"</string>
     <string name="keyboard_settings" msgid="1959697870618278081">"Keyboard"</string>
     <string name="manage_keyboard" msgid="4045394766282200132">"Manage keyboards"</string>
     <string name="text_to_speech_settings" msgid="811985746199507343">"Text to speech output"</string>
@@ -266,7 +266,7 @@
     <string name="units_unit_name_miles_per_gallon_uk" msgid="7700318800709988481">"Miles per gallon (UK)"</string>
     <string name="units_unit_name_kilometers_per_liter" msgid="8769902235588571155">"Kilometres per litre"</string>
     <string name="units_unit_name_liter_per_hundred_kilometers" msgid="4867647387452453552">"Litres per hundred kilometres"</string>
-    <string name="apps_and_notifications_settings" msgid="8704585874333781975">"Apps &amp; notifications"</string>
+    <string name="apps_and_notifications_settings" msgid="8704585874333781975">"Apps and notifications"</string>
     <string name="all_applications" msgid="7798210477486822168">"Show all apps"</string>
     <string name="default_applications" msgid="1558183275638697087">"Default apps"</string>
     <string name="app_permissions" msgid="32799922508313948">"App permissions"</string>
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"Not installed for this user"</string>
     <string name="permissions_label" msgid="2701446753515612685">"Permission"</string>
     <string name="notifications_label" msgid="6586089149665170731">"Notifications"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"Storage and cache"</string>
     <string name="application_version_label" msgid="8556889839783311649">"Version: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"No permissions granted"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"No permissions requested"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s in internal storage"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"Data usage"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"App data usage"</string>
     <string name="computing_size" msgid="5791407621793083965">"Computing…"</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"Recent Location Requests"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"No recent location requests"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"App-level permissions"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"Scanning"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"Location Services"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Wi‑Fi scanning"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Allow apps and services to scan for Wi‑Fi networks at any time, even when Wi‑Fi is off. This can be used, for example, to improve location-based features and services."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"Bluetooth scanning"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"Allow apps and services to scan for nearby devices at any time, even when Bluetooth is off. This can be used, for example, to improve location-based features and services."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"System"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"System updates"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Android version"</string>
@@ -419,9 +416,9 @@
     <string name="master_clear_confirm_button_text" msgid="7981254968588121786">"Erase everything"</string>
     <string name="master_clear_progress_title" msgid="7087480656932674774">"Erasing"</string>
     <string name="master_clear_progress_text" msgid="3440789441935303176">"Please wait..."</string>
-    <string name="date_and_time_settings_title" msgid="4058492663544475485">"Date &amp; time"</string>
+    <string name="date_and_time_settings_title" msgid="4058492663544475485">"Date and time"</string>
     <string name="date_and_time_settings_summary" msgid="7669856855390804666">"Set date, time, time zone, &amp; formats"</string>
-    <string name="date_time_auto" msgid="3570339569471779767">"Automatic date &amp; time"</string>
+    <string name="date_time_auto" msgid="3570339569471779767">"Automatic date and time"</string>
     <string name="date_time_auto_summary" msgid="3311706425095342759">"Use network-provided time"</string>
     <string name="zone_auto" msgid="3701878581920206160">"Automatic time zone"</string>
     <string name="zone_auto_summary" msgid="4345856882906981864">"Use network-provided time zone"</string>
@@ -481,7 +478,7 @@
     <string name="users_list_title" msgid="770764290290240909">"Users"</string>
     <string name="user_details_admin_title" msgid="3530292857178371891">"Permissions granted to %1$s"</string>
     <string name="storage_settings_title" msgid="8957054192781341797">"Storage"</string>
-    <string name="storage_music_audio" msgid="7827147379976134040">"Music &amp; audio"</string>
+    <string name="storage_music_audio" msgid="7827147379976134040">"Music and audio"</string>
     <string name="storage_other_apps" msgid="945509804756782640">"Other apps"</string>
     <string name="storage_files" msgid="6382081694781340364">"Files"</string>
     <string name="storage_system" msgid="1271345630248014010">"System"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> enrolment failed"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"Adding a trusted device requires you to set an authentication method next. If you do not have your trusted device with you, authentication will be required to access your profile."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"Device disconnected."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"Clear credentials"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"Remove all certificates"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"Remove all the contents?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"Credential storage has been erased."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"Credential storage couldn\'t be erased."</string>
     <string name="forget" msgid="3971143908183848527">"Forget"</string>
     <string name="connect" msgid="5861699594602380150">"Connect"</string>
     <string name="disconnect" msgid="6140789953324820336">"Disconnect"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"This will delete the demo account and factory data reset the system. All user data will be lost."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Exit Demo"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"DISMISS"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"Feature not available while driving."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"Can\'t add user while driving."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"Feature not available while driving"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"Can\'t add user while driving"</string>
 </resources>
diff --git a/res/values-en-rCA/config.xml b/res/values-en-rCA/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-en-rCA/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index c68531b..f9b7317 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -29,7 +29,7 @@
     <string name="keywords_display_auto_brightness" msgid="2700310050333468752">"dim screen, touchscreen, battery"</string>
     <string name="keywords_display_night_display" msgid="2922294576679769957">"dim screen, night, tint"</string>
     <string name="night_mode_tile_label" msgid="6603597795502131664">"Night mode"</string>
-    <string name="network_and_internet" msgid="4229023630498537530">"Network &amp; internet"</string>
+    <string name="network_and_internet" msgid="4229023630498537530">"Network and internet"</string>
     <string name="mobile_network_settings" msgid="1708621113321368597">"Mobile network"</string>
     <plurals name="mobile_network_summary_count" formatted="false" msgid="6917348330386831454">
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> SIMs</item>
@@ -151,7 +151,7 @@
     <string name="wifi_ap_2G" msgid="5364135697314262014">"2.4 GHz"</string>
     <string name="wifi_ap_5G" msgid="4945574428537860279">"5.0 GHz"</string>
     <string name="wifi_ap_band_select_one" msgid="615578175244067396">"Choose at least one band for Wi‑Fi hotspot:"</string>
-    <string name="tether_settings_title_all" msgid="4663704772599383169">"Hotspot &amp; tethering"</string>
+    <string name="tether_settings_title_all" msgid="4663704772599383169">"Hotspot and tethering"</string>
     <string name="wifi_hotspot_auto_off_title" msgid="7871858619924599922">"Turn off hotspot automatically"</string>
     <string name="wifi_hotspot_auto_off_summary" msgid="4830341947541735136">"Wi‑Fi hotspot will turn off if no devices are connected"</string>
     <string name="wifi_ask_enable" msgid="4452418245680754578">"<xliff:g id="REQUESTER">%s</xliff:g> wants to turn on Wi-Fi"</string>
@@ -198,7 +198,7 @@
     <string name="bluetooth_notif_message" msgid="1060821000510108726">"Tap to pair with <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_device_picker" msgid="673238198452345475">"Choose Bluetooth device"</string>
     <string name="language_settings" msgid="2079258598337245546">"Languages"</string>
-    <string name="languages_and_input_settings" msgid="3672322610529408248">"Languages &amp; input"</string>
+    <string name="languages_and_input_settings" msgid="3672322610529408248">"Languages and input"</string>
     <string name="keyboard_settings" msgid="1959697870618278081">"Keyboard"</string>
     <string name="manage_keyboard" msgid="4045394766282200132">"Manage keyboards"</string>
     <string name="text_to_speech_settings" msgid="811985746199507343">"Text to speech output"</string>
@@ -266,7 +266,7 @@
     <string name="units_unit_name_miles_per_gallon_uk" msgid="7700318800709988481">"Miles per gallon (UK)"</string>
     <string name="units_unit_name_kilometers_per_liter" msgid="8769902235588571155">"Kilometres per litre"</string>
     <string name="units_unit_name_liter_per_hundred_kilometers" msgid="4867647387452453552">"Litres per hundred kilometres"</string>
-    <string name="apps_and_notifications_settings" msgid="8704585874333781975">"Apps &amp; notifications"</string>
+    <string name="apps_and_notifications_settings" msgid="8704585874333781975">"Apps and notifications"</string>
     <string name="all_applications" msgid="7798210477486822168">"Show all apps"</string>
     <string name="default_applications" msgid="1558183275638697087">"Default apps"</string>
     <string name="app_permissions" msgid="32799922508313948">"App permissions"</string>
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"Not installed for this user"</string>
     <string name="permissions_label" msgid="2701446753515612685">"Permission"</string>
     <string name="notifications_label" msgid="6586089149665170731">"Notifications"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"Storage and cache"</string>
     <string name="application_version_label" msgid="8556889839783311649">"Version: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"No permissions granted"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"No permissions requested"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s in internal storage"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"Data usage"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"App data usage"</string>
     <string name="computing_size" msgid="5791407621793083965">"Computing…"</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"Recent Location Requests"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"No recent location requests"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"App-level permissions"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"Scanning"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"Location Services"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Wi‑Fi scanning"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Allow apps and services to scan for Wi‑Fi networks at any time, even when Wi‑Fi is off. This can be used, for example, to improve location-based features and services."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"Bluetooth scanning"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"Allow apps and services to scan for nearby devices at any time, even when Bluetooth is off. This can be used, for example, to improve location-based features and services."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"System"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"System updates"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Android version"</string>
@@ -419,9 +416,9 @@
     <string name="master_clear_confirm_button_text" msgid="7981254968588121786">"Erase everything"</string>
     <string name="master_clear_progress_title" msgid="7087480656932674774">"Erasing"</string>
     <string name="master_clear_progress_text" msgid="3440789441935303176">"Please wait..."</string>
-    <string name="date_and_time_settings_title" msgid="4058492663544475485">"Date &amp; time"</string>
+    <string name="date_and_time_settings_title" msgid="4058492663544475485">"Date and time"</string>
     <string name="date_and_time_settings_summary" msgid="7669856855390804666">"Set date, time, time zone, &amp; formats"</string>
-    <string name="date_time_auto" msgid="3570339569471779767">"Automatic date &amp; time"</string>
+    <string name="date_time_auto" msgid="3570339569471779767">"Automatic date and time"</string>
     <string name="date_time_auto_summary" msgid="3311706425095342759">"Use network-provided time"</string>
     <string name="zone_auto" msgid="3701878581920206160">"Automatic time zone"</string>
     <string name="zone_auto_summary" msgid="4345856882906981864">"Use network-provided time zone"</string>
@@ -481,7 +478,7 @@
     <string name="users_list_title" msgid="770764290290240909">"Users"</string>
     <string name="user_details_admin_title" msgid="3530292857178371891">"Permissions granted to %1$s"</string>
     <string name="storage_settings_title" msgid="8957054192781341797">"Storage"</string>
-    <string name="storage_music_audio" msgid="7827147379976134040">"Music &amp; audio"</string>
+    <string name="storage_music_audio" msgid="7827147379976134040">"Music and audio"</string>
     <string name="storage_other_apps" msgid="945509804756782640">"Other apps"</string>
     <string name="storage_files" msgid="6382081694781340364">"Files"</string>
     <string name="storage_system" msgid="1271345630248014010">"System"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> enrolment failed"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"Adding a trusted device requires you to set an authentication method next. If you do not have your trusted device with you, authentication will be required to access your profile."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"Device disconnected."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"Clear credentials"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"Remove all certificates"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"Remove all the contents?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"Credential storage has been erased."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"Credential storage couldn\'t be erased."</string>
     <string name="forget" msgid="3971143908183848527">"Forget"</string>
     <string name="connect" msgid="5861699594602380150">"Connect"</string>
     <string name="disconnect" msgid="6140789953324820336">"Disconnect"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"This will delete the demo account and factory data reset the system. All user data will be lost."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Exit Demo"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"DISMISS"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"Feature not available while driving."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"Can\'t add user while driving."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"Feature not available while driving"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"Can\'t add user while driving"</string>
 </resources>
diff --git a/res/values-en-rGB/config.xml b/res/values-en-rGB/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-en-rGB/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index c68531b..f9b7317 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -29,7 +29,7 @@
     <string name="keywords_display_auto_brightness" msgid="2700310050333468752">"dim screen, touchscreen, battery"</string>
     <string name="keywords_display_night_display" msgid="2922294576679769957">"dim screen, night, tint"</string>
     <string name="night_mode_tile_label" msgid="6603597795502131664">"Night mode"</string>
-    <string name="network_and_internet" msgid="4229023630498537530">"Network &amp; internet"</string>
+    <string name="network_and_internet" msgid="4229023630498537530">"Network and internet"</string>
     <string name="mobile_network_settings" msgid="1708621113321368597">"Mobile network"</string>
     <plurals name="mobile_network_summary_count" formatted="false" msgid="6917348330386831454">
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> SIMs</item>
@@ -151,7 +151,7 @@
     <string name="wifi_ap_2G" msgid="5364135697314262014">"2.4 GHz"</string>
     <string name="wifi_ap_5G" msgid="4945574428537860279">"5.0 GHz"</string>
     <string name="wifi_ap_band_select_one" msgid="615578175244067396">"Choose at least one band for Wi‑Fi hotspot:"</string>
-    <string name="tether_settings_title_all" msgid="4663704772599383169">"Hotspot &amp; tethering"</string>
+    <string name="tether_settings_title_all" msgid="4663704772599383169">"Hotspot and tethering"</string>
     <string name="wifi_hotspot_auto_off_title" msgid="7871858619924599922">"Turn off hotspot automatically"</string>
     <string name="wifi_hotspot_auto_off_summary" msgid="4830341947541735136">"Wi‑Fi hotspot will turn off if no devices are connected"</string>
     <string name="wifi_ask_enable" msgid="4452418245680754578">"<xliff:g id="REQUESTER">%s</xliff:g> wants to turn on Wi-Fi"</string>
@@ -198,7 +198,7 @@
     <string name="bluetooth_notif_message" msgid="1060821000510108726">"Tap to pair with <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_device_picker" msgid="673238198452345475">"Choose Bluetooth device"</string>
     <string name="language_settings" msgid="2079258598337245546">"Languages"</string>
-    <string name="languages_and_input_settings" msgid="3672322610529408248">"Languages &amp; input"</string>
+    <string name="languages_and_input_settings" msgid="3672322610529408248">"Languages and input"</string>
     <string name="keyboard_settings" msgid="1959697870618278081">"Keyboard"</string>
     <string name="manage_keyboard" msgid="4045394766282200132">"Manage keyboards"</string>
     <string name="text_to_speech_settings" msgid="811985746199507343">"Text to speech output"</string>
@@ -266,7 +266,7 @@
     <string name="units_unit_name_miles_per_gallon_uk" msgid="7700318800709988481">"Miles per gallon (UK)"</string>
     <string name="units_unit_name_kilometers_per_liter" msgid="8769902235588571155">"Kilometres per litre"</string>
     <string name="units_unit_name_liter_per_hundred_kilometers" msgid="4867647387452453552">"Litres per hundred kilometres"</string>
-    <string name="apps_and_notifications_settings" msgid="8704585874333781975">"Apps &amp; notifications"</string>
+    <string name="apps_and_notifications_settings" msgid="8704585874333781975">"Apps and notifications"</string>
     <string name="all_applications" msgid="7798210477486822168">"Show all apps"</string>
     <string name="default_applications" msgid="1558183275638697087">"Default apps"</string>
     <string name="app_permissions" msgid="32799922508313948">"App permissions"</string>
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"Not installed for this user"</string>
     <string name="permissions_label" msgid="2701446753515612685">"Permission"</string>
     <string name="notifications_label" msgid="6586089149665170731">"Notifications"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"Storage and cache"</string>
     <string name="application_version_label" msgid="8556889839783311649">"Version: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"No permissions granted"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"No permissions requested"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s in internal storage"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"Data usage"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"App data usage"</string>
     <string name="computing_size" msgid="5791407621793083965">"Computing…"</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"Recent Location Requests"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"No recent location requests"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"App-level permissions"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"Scanning"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"Location Services"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Wi‑Fi scanning"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Allow apps and services to scan for Wi‑Fi networks at any time, even when Wi‑Fi is off. This can be used, for example, to improve location-based features and services."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"Bluetooth scanning"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"Allow apps and services to scan for nearby devices at any time, even when Bluetooth is off. This can be used, for example, to improve location-based features and services."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"System"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"System updates"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Android version"</string>
@@ -419,9 +416,9 @@
     <string name="master_clear_confirm_button_text" msgid="7981254968588121786">"Erase everything"</string>
     <string name="master_clear_progress_title" msgid="7087480656932674774">"Erasing"</string>
     <string name="master_clear_progress_text" msgid="3440789441935303176">"Please wait..."</string>
-    <string name="date_and_time_settings_title" msgid="4058492663544475485">"Date &amp; time"</string>
+    <string name="date_and_time_settings_title" msgid="4058492663544475485">"Date and time"</string>
     <string name="date_and_time_settings_summary" msgid="7669856855390804666">"Set date, time, time zone, &amp; formats"</string>
-    <string name="date_time_auto" msgid="3570339569471779767">"Automatic date &amp; time"</string>
+    <string name="date_time_auto" msgid="3570339569471779767">"Automatic date and time"</string>
     <string name="date_time_auto_summary" msgid="3311706425095342759">"Use network-provided time"</string>
     <string name="zone_auto" msgid="3701878581920206160">"Automatic time zone"</string>
     <string name="zone_auto_summary" msgid="4345856882906981864">"Use network-provided time zone"</string>
@@ -481,7 +478,7 @@
     <string name="users_list_title" msgid="770764290290240909">"Users"</string>
     <string name="user_details_admin_title" msgid="3530292857178371891">"Permissions granted to %1$s"</string>
     <string name="storage_settings_title" msgid="8957054192781341797">"Storage"</string>
-    <string name="storage_music_audio" msgid="7827147379976134040">"Music &amp; audio"</string>
+    <string name="storage_music_audio" msgid="7827147379976134040">"Music and audio"</string>
     <string name="storage_other_apps" msgid="945509804756782640">"Other apps"</string>
     <string name="storage_files" msgid="6382081694781340364">"Files"</string>
     <string name="storage_system" msgid="1271345630248014010">"System"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> enrolment failed"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"Adding a trusted device requires you to set an authentication method next. If you do not have your trusted device with you, authentication will be required to access your profile."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"Device disconnected."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"Clear credentials"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"Remove all certificates"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"Remove all the contents?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"Credential storage has been erased."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"Credential storage couldn\'t be erased."</string>
     <string name="forget" msgid="3971143908183848527">"Forget"</string>
     <string name="connect" msgid="5861699594602380150">"Connect"</string>
     <string name="disconnect" msgid="6140789953324820336">"Disconnect"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"This will delete the demo account and factory data reset the system. All user data will be lost."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Exit Demo"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"DISMISS"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"Feature not available while driving."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"Can\'t add user while driving."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"Feature not available while driving"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"Can\'t add user while driving"</string>
 </resources>
diff --git a/res/values-en-rIN/config.xml b/res/values-en-rIN/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-en-rIN/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index c68531b..f9b7317 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -29,7 +29,7 @@
     <string name="keywords_display_auto_brightness" msgid="2700310050333468752">"dim screen, touchscreen, battery"</string>
     <string name="keywords_display_night_display" msgid="2922294576679769957">"dim screen, night, tint"</string>
     <string name="night_mode_tile_label" msgid="6603597795502131664">"Night mode"</string>
-    <string name="network_and_internet" msgid="4229023630498537530">"Network &amp; internet"</string>
+    <string name="network_and_internet" msgid="4229023630498537530">"Network and internet"</string>
     <string name="mobile_network_settings" msgid="1708621113321368597">"Mobile network"</string>
     <plurals name="mobile_network_summary_count" formatted="false" msgid="6917348330386831454">
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> SIMs</item>
@@ -151,7 +151,7 @@
     <string name="wifi_ap_2G" msgid="5364135697314262014">"2.4 GHz"</string>
     <string name="wifi_ap_5G" msgid="4945574428537860279">"5.0 GHz"</string>
     <string name="wifi_ap_band_select_one" msgid="615578175244067396">"Choose at least one band for Wi‑Fi hotspot:"</string>
-    <string name="tether_settings_title_all" msgid="4663704772599383169">"Hotspot &amp; tethering"</string>
+    <string name="tether_settings_title_all" msgid="4663704772599383169">"Hotspot and tethering"</string>
     <string name="wifi_hotspot_auto_off_title" msgid="7871858619924599922">"Turn off hotspot automatically"</string>
     <string name="wifi_hotspot_auto_off_summary" msgid="4830341947541735136">"Wi‑Fi hotspot will turn off if no devices are connected"</string>
     <string name="wifi_ask_enable" msgid="4452418245680754578">"<xliff:g id="REQUESTER">%s</xliff:g> wants to turn on Wi-Fi"</string>
@@ -198,7 +198,7 @@
     <string name="bluetooth_notif_message" msgid="1060821000510108726">"Tap to pair with <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_device_picker" msgid="673238198452345475">"Choose Bluetooth device"</string>
     <string name="language_settings" msgid="2079258598337245546">"Languages"</string>
-    <string name="languages_and_input_settings" msgid="3672322610529408248">"Languages &amp; input"</string>
+    <string name="languages_and_input_settings" msgid="3672322610529408248">"Languages and input"</string>
     <string name="keyboard_settings" msgid="1959697870618278081">"Keyboard"</string>
     <string name="manage_keyboard" msgid="4045394766282200132">"Manage keyboards"</string>
     <string name="text_to_speech_settings" msgid="811985746199507343">"Text to speech output"</string>
@@ -266,7 +266,7 @@
     <string name="units_unit_name_miles_per_gallon_uk" msgid="7700318800709988481">"Miles per gallon (UK)"</string>
     <string name="units_unit_name_kilometers_per_liter" msgid="8769902235588571155">"Kilometres per litre"</string>
     <string name="units_unit_name_liter_per_hundred_kilometers" msgid="4867647387452453552">"Litres per hundred kilometres"</string>
-    <string name="apps_and_notifications_settings" msgid="8704585874333781975">"Apps &amp; notifications"</string>
+    <string name="apps_and_notifications_settings" msgid="8704585874333781975">"Apps and notifications"</string>
     <string name="all_applications" msgid="7798210477486822168">"Show all apps"</string>
     <string name="default_applications" msgid="1558183275638697087">"Default apps"</string>
     <string name="app_permissions" msgid="32799922508313948">"App permissions"</string>
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"Not installed for this user"</string>
     <string name="permissions_label" msgid="2701446753515612685">"Permission"</string>
     <string name="notifications_label" msgid="6586089149665170731">"Notifications"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"Storage and cache"</string>
     <string name="application_version_label" msgid="8556889839783311649">"Version: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"No permissions granted"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"No permissions requested"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s in internal storage"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"Data usage"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"App data usage"</string>
     <string name="computing_size" msgid="5791407621793083965">"Computing…"</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"Recent Location Requests"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"No recent location requests"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"App-level permissions"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"Scanning"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"Location Services"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Wi‑Fi scanning"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Allow apps and services to scan for Wi‑Fi networks at any time, even when Wi‑Fi is off. This can be used, for example, to improve location-based features and services."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"Bluetooth scanning"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"Allow apps and services to scan for nearby devices at any time, even when Bluetooth is off. This can be used, for example, to improve location-based features and services."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"System"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"System updates"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Android version"</string>
@@ -419,9 +416,9 @@
     <string name="master_clear_confirm_button_text" msgid="7981254968588121786">"Erase everything"</string>
     <string name="master_clear_progress_title" msgid="7087480656932674774">"Erasing"</string>
     <string name="master_clear_progress_text" msgid="3440789441935303176">"Please wait..."</string>
-    <string name="date_and_time_settings_title" msgid="4058492663544475485">"Date &amp; time"</string>
+    <string name="date_and_time_settings_title" msgid="4058492663544475485">"Date and time"</string>
     <string name="date_and_time_settings_summary" msgid="7669856855390804666">"Set date, time, time zone, &amp; formats"</string>
-    <string name="date_time_auto" msgid="3570339569471779767">"Automatic date &amp; time"</string>
+    <string name="date_time_auto" msgid="3570339569471779767">"Automatic date and time"</string>
     <string name="date_time_auto_summary" msgid="3311706425095342759">"Use network-provided time"</string>
     <string name="zone_auto" msgid="3701878581920206160">"Automatic time zone"</string>
     <string name="zone_auto_summary" msgid="4345856882906981864">"Use network-provided time zone"</string>
@@ -481,7 +478,7 @@
     <string name="users_list_title" msgid="770764290290240909">"Users"</string>
     <string name="user_details_admin_title" msgid="3530292857178371891">"Permissions granted to %1$s"</string>
     <string name="storage_settings_title" msgid="8957054192781341797">"Storage"</string>
-    <string name="storage_music_audio" msgid="7827147379976134040">"Music &amp; audio"</string>
+    <string name="storage_music_audio" msgid="7827147379976134040">"Music and audio"</string>
     <string name="storage_other_apps" msgid="945509804756782640">"Other apps"</string>
     <string name="storage_files" msgid="6382081694781340364">"Files"</string>
     <string name="storage_system" msgid="1271345630248014010">"System"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> enrolment failed"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"Adding a trusted device requires you to set an authentication method next. If you do not have your trusted device with you, authentication will be required to access your profile."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"Device disconnected."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"Clear credentials"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"Remove all certificates"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"Remove all the contents?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"Credential storage has been erased."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"Credential storage couldn\'t be erased."</string>
     <string name="forget" msgid="3971143908183848527">"Forget"</string>
     <string name="connect" msgid="5861699594602380150">"Connect"</string>
     <string name="disconnect" msgid="6140789953324820336">"Disconnect"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"This will delete the demo account and factory data reset the system. All user data will be lost."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Exit Demo"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"DISMISS"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"Feature not available while driving."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"Can\'t add user while driving."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"Feature not available while driving"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"Can\'t add user while driving"</string>
 </resources>
diff --git a/res/values-en-rXC/config.xml b/res/values-en-rXC/config.xml
new file mode 100644
index 0000000..0766e45
--- /dev/null
+++ b/res/values-en-rXC/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‎‏‏‎‎‏‎‎‎‏‎‏‏‎‎‎‎‎‎‎‎‎‏‎‎‏‏‏‎‎‏‏‎‏‎‏‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‏‏‏‎‎‏‎content://settings/system/notification_sound‎‏‎‎‏‎"</item>
+    <item msgid="3796938293683976227">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‏‎‎‏‎‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‏‎‎‎‎‏‎‏‏‎‏‎‏‎‏‎‎‎‏‏‏‎‎‎‏‏‏‏‎‎‎‎‎‏‎‎‎‏‏‎content://settings/system/alarm_alert‎‏‎‎‏‎"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index 3953f34..b433e39 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‎‏‏‏‎‏‎‏‎‎‎‏‏‎‎‎‎‏‏‏‏‏‎‏‏‎‎‏‏‏‏‏‏‎‏‏‎‎‏‏‎‏‎‏‏‏‎‎‏‏‏‎‎‎‏‏‎‏‎‏‎‏‎‎Not installed for this user‎‏‎‎‏‎"</string>
     <string name="permissions_label" msgid="2701446753515612685">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‎‏‎‎‏‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‏‏‏‎‎‎‎‎‏‎‎‏‏‎‏‎‏‎‏‏‏‎‏‏‏‎‎‎‏‎‏‎‏‎‎‎‎‎‏‏‎‏‎Permissions‎‏‎‎‏‎"</string>
     <string name="notifications_label" msgid="6586089149665170731">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‏‏‎‎‏‏‎‎‏‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‏‎‏‏‎‎‎‏‏‎‏‎‏‎‏‎‎‏‎‏‎‏‏‎Notifications‎‏‎‎‏‎"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‎‎‏‎‏‎‏‏‎‏‏‏‎‎‏‎‎‎‎‎‎‎‎‎‎‏‏‏‎‎‏‎‎‏‏‎‏‎‎‎‎‎‏‎‎‎‎‎‎‏‏‎‏‎‎Storage &amp; cache‎‏‎‎‏‎"</string>
     <string name="application_version_label" msgid="8556889839783311649">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‎‎‎‎‎‎‏‎‏‏‎‏‏‏‏‏‏‎‎‏‎‎‎‏‎‎‏‎‎‏‏‎‏‏‏‎‏‏‏‏‏‎‎‏‎‎‏‎‎‎‎‏‎Version: %1$s‎‏‎‎‏‎"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‎‏‎‎‏‎‎‏‎‏‏‎‎‏‎‏‎‎‏‎‏‎‎‏‎‎‎‎‎‎‏‏‎‎‏‏‏‏‎‎‎‏‏‎‎‎‏‎‎‎‏‎‎‏‎‏‎No permissions granted‎‏‎‎‏‎"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‎‏‏‏‎‎‎‏‎‎‎‏‎‏‎‏‎‎‎‏‎‏‎‎‎‎‎‏‎‏‏‏‏‎‏‎‎‎‏‎‏‏‏‎‏‎‏‎‏‎‎‎‏‏‏‎‏‏‏‏‎‏‎‎No permissions requested‎‏‎‎‏‎"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‏‎‏‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‎‎‎‎‏‏‎‎‏‏‎‏‎‎‏‏‏‏‏‎‎‎‏‎‏‎‎‎‎‏‎‎%s in internal storage‎‏‎‎‏‎"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‎‏‏‏‏‎‎‏‎‎‏‏‏‏‎‎‏‎‏‎‏‏‏‎‏‏‎‎‎‎‏‎‎‏‎‏‏‎‏‏‎‏‏‎‎‎‎‎‎‎‎‏‏‏‏‎‎‏‏‏‎‏‎‎Data usage‎‏‎‎‏‎"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‎‏‎‎‎‏‎‎‏‏‏‎‏‎‎‎‎‎‏‏‏‏‎‎‎‎‏‏‏‎‏‎‏‏‎‎‎‎‎‎‏‏‎‎‏‎‎‏‏‎‏‏‎‎‎App data usage‎‏‎‎‏‎"</string>
     <string name="computing_size" msgid="5791407621793083965">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‎‏‏‏‏‏‎‎‏‏‎‏‏‎‏‎‎‎‏‏‎‎‎‎‏‏‏‏‏‎‎‏‏‏‎‏‏‏‎‏‏‏‎‎‏‎‎‎‏‏‏‏‎‏‎Computing…‎‏‎‎‏‎"</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‎‏‎‎‎‎‎‎‏‏‏‎‎‎‏‏‎‏‏‎‎‏‏‎‎‏‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‏‏‎‏‏‎‏‎‎‎‏‎‎‎Recent Location Requests‎‏‎‎‏‎"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‏‏‎‏‎‎‏‏‏‎‏‎‎‏‏‏‎‏‏‎‏‏‏‎‎‎‎‏‏‏‏‏‎‏‎‏‎‎‏‎‎‎‎‏‎‏‎‎‏‏‏‏‎‎No recent location requests‎‏‎‎‏‎"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‎‎‏‎‏‏‏‎‏‏‏‎‏‏‎‎‏‏‏‏‎‎‏‏‏‎‎‎‏‏‏‏‎‎‏‎‏‏‏‎‎‏‏‎‏‏‎‏‏‏‎‏‎‎‏‏‏‎‎‎App-level permissions‎‏‎‎‏‎"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‎‏‏‏‎‏‏‎‎‎‎‏‎‎‏‎‎‎‎‏‏‎‏‎‎‏‏‏‎‏‎‏‏‏‏‎‏‎‏‏‏‎‎‏‏‎‏‏‎‎‏‏‎‏‎‏‎‎‎‎‏‎‎‎Scanning‎‏‎‎‏‎"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‎‏‏‎‎‎‎‎‏‏‏‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‏‎‎‏‎‏‎‎‎‏‎‏‏‎‎‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‎Location Services‎‏‎‎‏‎"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‏‎‏‎‎‏‎‎‏‎‎‏‏‎‏‎‏‎‎‎‎‏‏‏‏‎‏‎‏‏‏‏‎‎‎‎‎‎‏‏‎‏‏‎‎‏‏‎‎‏‎‎‏‏‏‎Wi‑Fi scanning‎‏‎‎‏‎"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‎‏‏‏‏‎‏‎‏‎‏‏‏‏‎‏‎‎‎‏‏‎‏‎‎‎‎‏‏‎‎‏‎‎‏‏‏‏‏‎‎‎‏‎‎‏‏‎‎‏‏‎‎‏‎‏‏‎‏‏‏‎‎‎Allow apps and services to scan for Wi‑Fi networks at any time, even when Wi‑Fi is off. This can be used, for example, to improve location-based features and services.‎‏‎‎‏‎"</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‎‎‏‎‎‏‏‎‏‏‎‎‏‏‎‏‏‏‎‏‏‎‏‏‏‎‏‏‎‎‏‎‎‏‏‏‎‏‎‏‏‏‎‎‏‏‏‎‎‏‏‎‎‎‏‏‎‏‏‎Bluetooth scanning‎‏‎‎‏‎"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‎‎‎‎‏‏‏‎‏‎‎‎‎‎‏‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‎‏‎‎‏‎‎‏‎‏‎‎‎‏‎‏‏‎‎Allow apps and services to scan for nearby devices at any time, even when Bluetooth is off. This can be used, for example, to improve location-based features and services.‎‏‎‎‏‎"</string>
     <string name="system_setting_title" msgid="6864599341809463440">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‎‏‎‏‏‏‎‏‏‎‎‏‎‏‏‎‏‏‏‏‎‏‏‏‎‏‏‏‏‎‎‎‎‏‎‎‏‎‎‎‎‎System‎‏‎‎‏‎"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‏‏‏‏‎‏‏‎‏‎‏‎‎‏‎‎‎‏‎‎‎‏‎‏‏‎‏‎‏‏‎‎‏‏‏‎‎‏‏‏‎‎‎‎‎‏‏‎‎‏‏‏‎System updates‎‏‎‎‏‎"</string>
     <string name="firmware_version" msgid="8491753744549309333">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‏‎‎‎‏‏‎‎‎‏‎‏‎‎‎‎‏‎‏‎‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‏‎‏‏‏‎‎‏‎‏‎‏‎Android version‎‏‎‎‏‎"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‏‎‎‎‏‏‎‎‏‎‏‎‎‎‎‏‎‎‏‏‎‏‎‏‎‏‎‏‎‎‏‏‏‎‎‎‎‏‎‎‎‎‏‏‏‎‎‎‎‎‎‏‎‎‎‎‏‎‎‏‏‎<xliff:g id="DEVICE_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ enrollment failed‎‏‎‎‏‎"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‎‎‏‎‎‎‎‏‎‎‎‎‏‏‏‎‎‎‏‏‏‏‎‎‏‎‎‎‏‏‎‏‎‏‎‎‏‏‏‏‎‏‏‎‏‎‏‎‏‎‎‎‎‏‎Adding a trusted device requires you to set an authentication method next. If you do not have your trusted device with you, authentication will be required to access your profile.‎‏‎‎‏‎"</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‎‏‎‎‎‏‏‎‏‎‎‎‏‏‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‎‏‏‎‎‎‎‎‎‏‏‏‎‏‏‏‏‏‎‎‎‎‏‏‏‏‏‏‏‎Device disconnected.‎‏‎‎‏‎"</string>
+    <string name="credentials_reset" msgid="873900550885788639">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‎‎‏‏‎‎‎‎‏‎‎‎‎‎‏‎‏‏‎‏‏‏‏‏‏‎‏‎‏‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎Clear credentials‎‏‎‎‏‎"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‏‏‎‏‎‏‏‎‎‎‏‏‎‏‎‏‏‎‎‏‏‏‎‎‏‏‏‏‎‏‎‏‎‎‎‎‎‏‎‏‏‏‎‏‏‎‎‏‏‏‎‏‎‏‎Remove all certificates‎‏‎‎‏‎"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‎‎‎‎‎‎‎‎‎‎‏‏‏‎‎‏‏‎‏‎‎‏‏‎‏‏‎‎‏‎‎‎‏‎‎‎‎‏‏‏‏‏‎‏‎‏‎‏‏‎‎‎‎‏‏‏‏‎‏‎Remove all the contents?‎‏‎‎‏‎"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‎‏‎‎‎‏‎‏‏‏‎‏‎‏‎‎‏‎‏‎‎‏‏‏‏‎‎‎‎‏‏‎‎‏‏‎‏‎‎‏‎‎‏‎‎‎‏‏‏‏‎‏‏‏‎‎‎‏‎‏‎‏‏‎Credential storage is erased.‎‏‎‎‏‎"</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‏‎‏‎‎‏‏‎‎‎‎‏‎‎‏‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‏‎‎‎‏‎‎‎‏‎‎‏‏‏‏‎‎‏‎‎‎‎‎‎‎Credential storage couldn’t be erased.‎‏‎‎‏‎"</string>
     <string name="forget" msgid="3971143908183848527">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‏‏‏‎‎‎‏‏‏‎‎‎‏‎‏‎‏‏‎‎‏‎‏‏‎‎‎‎‎‏‎‏‏‏‏‎‏‎‎‎‎‎‏‎‎‏‏‎‏‏‎‎‏‎‎‏‏‏‏‎Forget‎‏‎‎‏‎"</string>
     <string name="connect" msgid="5861699594602380150">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‎‏‏‎‎‎‏‏‏‏‎‎‎‎‏‎‏‏‏‎‎‏‏‎‎‎‎‏‎‎‎‏‎‏‎‎‏‏‎‏‏‏‏‎‏‏‎‏‏‏‎‏‏‎‎Connect‎‏‎‎‏‎"</string>
     <string name="disconnect" msgid="6140789953324820336">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‏‏‏‎‎‎‎‏‏‏‎‏‏‏‏‏‏‎‏‏‎‏‎‏‏‎‎‎‎‎‎‎‏‏‎‏‏‎‏‎‏‎‎‏‏‏‎‏‏‏‎‎‎‎‎Disconnect‎‏‎‎‏‎"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‏‏‎‎‎‏‎‎‏‏‎‎‎‏‎‏‎‎‎‎‎‎‏‏‏‎‏‎‎‎‏‎‏‏‎‎‎‏‎‎‎‎‏‏‎‎‏‎‏‎‎‎‏‎‏‎This will delete the demo account and factory data reset the system. All user data will be lost.‎‏‎‎‏‎"</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‎‏‏‏‎‏‎‏‏‎‏‎‏‎‎‎‏‏‎‏‏‏‎‎‏‏‏‏‎‏‎‎‏‏‏‎‎‎‎‏‏‏‎‎‏‎‏‎‏‎‎‏‎‎‎‏‎‎‏‎Exit Demo‎‏‎‎‏‎"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‎‏‏‏‏‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‎‏‏‏‏‎‎‎‎‎‎‎‏‏‎‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‎‎‎‎‎‎‏‎‎‎‏‎DISMISS‎‏‎‎‏‎"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‎‎‏‎‎‎‏‎‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‎‎‎‎‏‎‎‎‏‎‏‎‏‎‏‏‎Feature not available while driving.‎‏‎‎‏‎"</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‎‏‏‎‎‎‏‎‎‎‏‎‏‎‎‎‏‎‎‎‏‎‎‎‎‎‏‎‏‏‏‎‏‏‏‏‏‏‎‎‎‏‎‏‎‏‏‏‎‎‎‏‎‎‎Can\'t add user while driving.‎‏‎‎‏‎"</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‏‏‎‏‎‏‏‏‎‏‏‏‏‏‏‎‏‎‏‎‏‎‎‎‏‏‏‏‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‎‏‎‎‎‎‏‏‏‎‎‎Feature not available while driving‎‏‎‎‏‎"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‏‎‏‏‏‎‎‎‎‏‎‏‎‏‎‎‏‏‎‏‎‏‎‎‏‏‎‏‏‏‎‎‏‏‏‎‎‏‏‎‎‎‎Can\'t add user while driving‎‏‎‎‏‎"</string>
 </resources>
diff --git a/res/values-es-rUS/config.xml b/res/values-es-rUS/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-es-rUS/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 1056d8c..82ca4dc 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -151,7 +151,7 @@
     <string name="wifi_ap_2G" msgid="5364135697314262014">"2.4 GHz"</string>
     <string name="wifi_ap_5G" msgid="4945574428537860279">"5.0 GHz"</string>
     <string name="wifi_ap_band_select_one" msgid="615578175244067396">"Elige al menos una banda para el hotspot de Wi-Fi:"</string>
-    <string name="tether_settings_title_all" msgid="4663704772599383169">"Hotspot y conexión mediante dispositivo portátil"</string>
+    <string name="tether_settings_title_all" msgid="4663704772599383169">"Hotspot y conexión mediante dispositivo móvil"</string>
     <string name="wifi_hotspot_auto_off_title" msgid="7871858619924599922">"Desactivar hotspot automáticamente"</string>
     <string name="wifi_hotspot_auto_off_summary" msgid="4830341947541735136">"Si no hay dispositivos conectados, se desactivará el hotspot de Wi‑Fi"</string>
     <string name="wifi_ask_enable" msgid="4452418245680754578">"<xliff:g id="REQUESTER">%s</xliff:g> quiere activar la conexión Wi-Fi"</string>
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"No se instaló para este usuario"</string>
     <string name="permissions_label" msgid="2701446753515612685">"Permisos"</string>
     <string name="notifications_label" msgid="6586089149665170731">"Notificaciones"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"Almacenamiento y caché"</string>
     <string name="application_version_label" msgid="8556889839783311649">"Versión: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"No se otorgaron permisos"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"No se solicitaron permisos"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s de almacenamiento interno"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"Uso de datos"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"Uso de datos de la app"</string>
     <string name="computing_size" msgid="5791407621793083965">"Calculando…"</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"Solicitudes de ubicación recientes"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"No hay solicitudes de ubicación recientes"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"Permisos en las apps"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"Búsqueda"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"Servicios de ubicación"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Búsqueda de redes Wi‑Fi"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Permite que las apps y los servicios busquen redes Wi-Fi en cualquier momento, aunque la conexión Wi-Fi esté desactivada. Puede usarse, por ejemplo, para mejorar las funciones y los servicios basados en la ubicación."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"Búsqueda de dispositivos Bluetooth"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"Permite que apps y servicios busquen dispositivos cercanos en cualquier momento, aunque la conexión Bluetooth esté desactivada. Puede usarse, por ejemplo, para mejorar las funciones y los servicios basados en la ubicación."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"Sistema"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"Actualizaciones del sistema"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Versión de Android"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"Se ha producido un error al registrar <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"Después de agregar un dispositivo de confianza, deberás establecer un método de autenticación. Ese método te permitirá acceder a tu perfil cuando no lleves contigo el dispositivo de confianza."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"Se desconectó el dispositivo."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"Borrar credenciales"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"Quitar todos los certificados"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"¿Quieres quitar todas las credenciales?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"Se borró el almacenamiento de credenciales."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"No se pudo borrar el almacenamiento de credenciales."</string>
     <string name="forget" msgid="3971143908183848527">"Olvidar"</string>
     <string name="connect" msgid="5861699594602380150">"Conectar"</string>
     <string name="disconnect" msgid="6140789953324820336">"Desconectar"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Esta acción borrará la cuenta de demostración y restablecerá el sistema a la configuración de fábrica. Se perderán todos los datos del usuario."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Salir de la demostración"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"DESCARTAR"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"Esta función no está disponible mientras conduces."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"No puedes agregar usuarios mientras conduces."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"Esta función no está disponible mientras conduces"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"No puedes agregar usuarios mientras conduces"</string>
 </resources>
diff --git a/res/values-es/config.xml b/res/values-es/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-es/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index bc72cf9..cf7c821 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -135,7 +135,7 @@
     <string name="wifi_cellular_fallback_title" msgid="8322675436784870862">"Cambiar a datos móviles automáticamente"</string>
     <string name="wifi_cellular_fallback_summary" msgid="2433848528924203758">"Utiliza la conexión de datos móviles cuando no haya acceso a Internet a través de la red Wi‑Fi. Podrían aplicarse cargos por el uso de datos."</string>
     <string name="learn_more" msgid="8214605928933358604">"Más información"</string>
-    <string name="wifi_hotspot_name_title" msgid="8844779338692535356">"Nombre punto acceso"</string>
+    <string name="wifi_hotspot_name_title" msgid="8844779338692535356">"Nombre del punto de acceso"</string>
     <string name="wifi_hotspot_name_summary_connecting" msgid="5262510450498600038">"Activando <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="7421325340822195506">"Otros dispositivos pueden conectarse a <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="4103948315849351988">"Contraseña del punto de acceso"</string>
@@ -151,8 +151,8 @@
     <string name="wifi_ap_2G" msgid="5364135697314262014">"2,4 GHz"</string>
     <string name="wifi_ap_5G" msgid="4945574428537860279">"5,0 GHz"</string>
     <string name="wifi_ap_band_select_one" msgid="615578175244067396">"Elige mín. 1 banda para punto acceso Wi‑Fi:"</string>
-    <string name="tether_settings_title_all" msgid="4663704772599383169">"Punto de acceso y conexión compartida"</string>
-    <string name="wifi_hotspot_auto_off_title" msgid="7871858619924599922">"Desactivar el punto de acceso automáticamente"</string>
+    <string name="tether_settings_title_all" msgid="4663704772599383169">"Punto de acceso/Conexión compartida"</string>
+    <string name="wifi_hotspot_auto_off_title" msgid="7871858619924599922">"Desactivar punto de acceso automáticamente"</string>
     <string name="wifi_hotspot_auto_off_summary" msgid="4830341947541735136">"El punto de acceso Wi‑Fi se desactivará si no hay dispositivos conectados"</string>
     <string name="wifi_ask_enable" msgid="4452418245680754578">"<xliff:g id="REQUESTER">%s</xliff:g> quiere activar la conexión Wi-Fi"</string>
     <string name="wifi_ask_disable" msgid="2949290055916181553">"<xliff:g id="REQUESTER">%s</xliff:g> quiere desactivar la conexión Wi-Fi"</string>
@@ -216,8 +216,8 @@
     <string name="media_volume_summary" msgid="2961762827637127239">"Establecer volumen para música y vídeos"</string>
     <string name="alarm_volume_title" msgid="840384014895796587">"Alarma"</string>
     <string name="ringtone_title" msgid="8370531086214517972">"Tono de llamada del teléfono"</string>
-    <string name="notification_ringtone_title" msgid="8661716239594010288">"Sonido notificación predeterm."</string>
-    <string name="alarm_ringtone_title" msgid="3257364170646440908">"Sonido alarma predeterminado"</string>
+    <string name="notification_ringtone_title" msgid="8661716239594010288">"Sonido de notificación predeterminado"</string>
+    <string name="alarm_ringtone_title" msgid="3257364170646440908">"Sonido de alarma predeterminado"</string>
     <string name="units_settings" msgid="402325305096925886">"Unidades"</string>
     <string name="units_speed_title" msgid="7115143916747108160">"Velocidad"</string>
     <string name="units_distance_title" msgid="6257691565990474635">"Distancia"</string>
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"No instalada para este usuario"</string>
     <string name="permissions_label" msgid="2701446753515612685">"Permisos"</string>
     <string name="notifications_label" msgid="6586089149665170731">"Notificaciones"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"Almacenamiento y caché"</string>
     <string name="application_version_label" msgid="8556889839783311649">"Versión: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"No se han concedido permisos"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"No se han solicitado permisos"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s en el almacenamiento interno"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"Uso de datos"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"Uso de datos de la app"</string>
     <string name="computing_size" msgid="5791407621793083965">"Calculando…"</string>
@@ -322,9 +324,9 @@
     <string name="app_link_open_ask" msgid="7242075065136237456">"Preguntar siempre"</string>
     <string name="app_link_open_never" msgid="2173174327831792316">"No abrir en esta aplicación"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="7345116365785981158">"Enlaces compatibles"</string>
-    <string name="special_access" msgid="5730278220917123811">"Acceso especial de apps"</string>
-    <string name="show_system" msgid="4401355756969485287">"Mostrar apps del sistema"</string>
-    <string name="hide_system" msgid="8845453295584638040">"Ocultar apps del sistema"</string>
+    <string name="special_access" msgid="5730278220917123811">"Acceso especial de aplicaciones"</string>
+    <string name="show_system" msgid="4401355756969485287">"Mostrar sistema"</string>
+    <string name="hide_system" msgid="8845453295584638040">"Ocultar sistema"</string>
     <string name="modify_system_settings_title" msgid="4596320571562433972">"Modificar ajustes del sistema"</string>
     <string name="modify_system_settings_description" msgid="5295023124419592452">"Cuando se concede este permiso, la aplicación puede modificar los ajustes del sistema."</string>
     <string name="notification_access_title" msgid="1467340098885813473">"Acceso a las notificaciones"</string>
@@ -344,19 +346,14 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"Solicitudes de ubicación recientes"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"Ninguna solicitud de ubicación reciente"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"Permisos de las aplicaciones"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"Búsqueda"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"Servicios de ubicación"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Búsqueda de redes Wi‑Fi"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Permite que las aplicaciones y los servicios busquen redes Wi‑Fi en cualquier momento aunque la conexión Wi‑Fi esté desactivada. Se utiliza, por ejemplo, para mejorar los servicios y funciones basados en la ubicación."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"Búsqueda de dispositivos Bluetooth"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"Permite que las aplicaciones y los servicios busquen dispositivos cercanos en cualquier momento aunque la conexión Bluetooth esté desactivada. Se utiliza, por ejemplo, para mejorar los servicios y funciones basados en la ubicación."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"Sistema"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"Actualizaciones del sistema"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Versión de Android"</string>
     <string name="security_patch" msgid="4794276590178386903">"Nivel del parche de seguridad de Android"</string>
     <string name="model_info" msgid="4966408071657934452">"Modelo"</string>
     <string name="baseband_version" msgid="2370088062235041897">"Versión de banda base"</string>
-    <string name="kernel_version" msgid="7327212934187011508">"Versión de kernel"</string>
+    <string name="kernel_version" msgid="7327212934187011508">"Versión del kernel"</string>
     <string name="build_number" msgid="3997326631001009102">"Número de compilación"</string>
     <string name="bluetooth_mac_address" msgid="7641425947941688072">"Dirección de Bluetooth"</string>
     <string name="device_info_not_available" msgid="2095601973977376655">"No disponible"</string>
@@ -392,7 +389,7 @@
     <string name="reset_options_title" msgid="4388902952861833420">"Opciones de recuperación"</string>
     <string name="reset_options_summary" msgid="5508201367420359293">"Restablecer dispositivo, aplicaciones y red"</string>
     <string name="reset_network_title" msgid="1284233059990797263">"Restablecer red"</string>
-    <string name="reset_network_desc" msgid="602381374544634925">"Se restablecerán todos los ajustes de red, incluidas las siguientes opciones:"</string>
+    <string name="reset_network_desc" msgid="602381374544634925">"Se restablecerán todos los ajustes de red, como:"</string>
     <string name="reset_network_item_wifi" msgid="7569481589699982698"><li>"Wi‑Fi"</li></string>
     <string name="reset_network_item_mobile" msgid="5747282716664480997"><li>"Datos móviles"</li></string>
     <string name="reset_network_item_bluetooth" msgid="6035019931106921284"><li>"Bluetooth"</li></string>
@@ -424,7 +421,7 @@
     <string name="date_time_auto" msgid="3570339569471779767">"Fecha y hora automáticas"</string>
     <string name="date_time_auto_summary" msgid="3311706425095342759">"Usar la hora proporcionada por la red"</string>
     <string name="zone_auto" msgid="3701878581920206160">"Zona horaria automática"</string>
-    <string name="zone_auto_summary" msgid="4345856882906981864">"Usar zona horaria proporcionada por la red"</string>
+    <string name="zone_auto_summary" msgid="4345856882906981864">"Usar la zona horaria proporcionada por la red"</string>
     <string name="date_time_24hour_title" msgid="3025576547136168692">"Formato de 24 horas"</string>
     <string name="date_time_24hour" msgid="1137618702556486913">"Usar formato de 24 horas"</string>
     <string name="date_time_set_time_title" msgid="5884883050656937853">"Hora"</string>
@@ -432,7 +429,7 @@
     <string name="date_time_set_timezone_title" msgid="3001779256157093425">"Zona horaria"</string>
     <string name="date_time_set_timezone" msgid="4759353576185916944">"Seleccionar zona horaria"</string>
     <string name="date_time_set_date_title" msgid="6834785820357051138">"Fecha"</string>
-    <string name="date_time_set_date" msgid="2537494485643283230">"Definir fecha"</string>
+    <string name="date_time_set_date" msgid="2537494485643283230">"Establecer fecha"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="7041628618528523514">"Ordenar alfabéticamente"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="4944880536057914136">"Ordenar por zona horaria"</string>
     <string name="date_picker_title" msgid="1533614225273770178">"Fecha"</string>
@@ -504,7 +501,7 @@
     <string name="no_accounts_added" msgid="5148163140691096055">"No se ha añadido ninguna cuenta"</string>
     <string name="account_list_title" msgid="7631588514613843065">"Cuentas de <xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>"</string>
     <string name="account_auto_sync_title" msgid="3238816995364191432">"Sincronizar datos automáticamente"</string>
-    <string name="account_auto_sync_summary" msgid="6963837893148304128">"Permitir que las apps actualicen los datos automáticamente"</string>
+    <string name="account_auto_sync_summary" msgid="6963837893148304128">"Permite que las aplicaciones actualicen los datos automáticamente"</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="6027487764261344033">"¿Activar sincronización autom.?"</string>
     <string name="data_usage_auto_sync_on_dialog" msgid="2770233931307606956">"Los cambios que hagas en tus cuentas en la Web se reflejarán automáticamente en el dispositivo.\n\nAlgunas cuentas como, por ejemplo, las cuentas de Google, también reflejarán en la Web los cambios que hagas en el teléfono. A continuación, puedes ver cómo funciona  una cuenta de Google."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="1235955038330202536">"¿Desactivar sincronización aut.?"</string>
@@ -529,7 +526,7 @@
 %1$s</xliff:g>)"</string>
     <string name="sync_button_sync_now" msgid="5767643057970371315">"Sincronizar"</string>
     <string name="sync_button_sync_cancel" msgid="7739510554513641393">"Cancelar sincronización"</string>
-    <string name="sync_is_failing" msgid="5766255460901806206">"No se puede sincronizar el dispositivo en este momento. Se restablecerá en breve."</string>
+    <string name="sync_is_failing" msgid="5766255460901806206">"En este momento hay problemas con la sincronización. Se restablecerá en breve."</string>
     <string name="security_settings_title" msgid="6955331714774709746">"Seguridad"</string>
     <string name="security_settings_subtitle" msgid="2244635550239273229">"Bloqueo de pantalla"</string>
     <string name="security_lock_none" msgid="1054645093754839638">"Ninguno"</string>
@@ -638,8 +635,13 @@
     <string name="trusted_device_pairing_code_dialog_title" msgid="8173792468216796873">"Confirma que los códigos de sincronización coinciden"</string>
     <string name="trusted_device_success_enrollment_toast" msgid="1238468775285575827">"El teléfono se ha registrado correctamente"</string>
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> no se ha podido registrar"</string>
-    <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"Para añadir un dispositivo de confianza, debes definir un método de autenticación. Si no tienes el dispositivo de confianza a mano, tendrás que realizar el proceso de autenticación para acceder a tu perfil."</string>
+    <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"Para añadir un dispositivo de confianza, debes configurar un método de autenticación. Si no tienes el dispositivo de confianza a mano, tendrás que autenticarte para acceder a tu perfil."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"El dispositivo se ha desconectado."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"Eliminar certificados"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"Quitar todos los certificados"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"¿Seguro que quieres quitar todos los contenidos?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"Almacenamiento de credenciales borrado."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"No se ha podido borrar el almacenamiento de credenciales."</string>
     <string name="forget" msgid="3971143908183848527">"Olvidar"</string>
     <string name="connect" msgid="5861699594602380150">"Conectar"</string>
     <string name="disconnect" msgid="6140789953324820336">"Desconectar"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Se eliminará la cuenta de demostración y se recuperarán los ajustes de fábrica del sistema. Se perderán todos los datos de usuario."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Salir de demostración"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"CERRAR"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"Esta función no está disponible mientras conduces."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"No puedes añadir usuarios mientras conduces."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"Esta función no está disponible mientras se conduce"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"No se puede añadir un usuario mientras se conduce"</string>
 </resources>
diff --git a/res/values-et/config.xml b/res/values-et/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-et/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 8e6af32..718e56f 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"Pole selle kasutaja jaoks installitud"</string>
     <string name="permissions_label" msgid="2701446753515612685">"Load"</string>
     <string name="notifications_label" msgid="6586089149665170731">"Märguanded"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"Salvestusruum ja vahemälu"</string>
     <string name="application_version_label" msgid="8556889839783311649">"Versioon: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"Lube pole antud"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"Lube ei taotletud"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s sisemist salvestusruumi"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"Andmekasutus"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"Rakenduste andmekasutus"</string>
     <string name="computing_size" msgid="5791407621793083965">"Arvutamine …"</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"Hiljutised asukohapäringud"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"Ühtegi hiljutist asukohapäringut pole"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"Rakendusetasemel load"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"Skannimine"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"Asukohateenused"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"WiFi-võrkude otsimine"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Lubage rakendustel ja teenustel alati otsida WiFi-võrke isegi siis, kui WiFi on väljas. Seda saab kasutada näiteks asukohapõhiste funktsioonide ja teenuste täiustamiseks."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"Bluetoothi otsimine"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"Lubage rakendustel ja teenustel alati otsida läheduses olevaid seadmeid isegi siis, kui Bluetooth on väljas. Seda saab kasutada näiteks asukohapõhiste funktsioonide ja teenuste täiustamiseks."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"Süsteem"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"Süsteemivärskendused"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Androidi versioon"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"Seadme <xliff:g id="DEVICE_NAME">%1$s</xliff:g> registreerimine ebaõnnestus"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"Usaldusväärse seadme lisamiseks peate hiljem määrama autentimismeetodi. Kui usaldusväärne seade pole teie käes, nõutakse teie profiilile juurdepääsemiseks autentimist."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"Seadme ühendus on katkestatud."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"Mandaatide kustutamine"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"Kõikide sertifikaatide eemaldamine"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"Kas eemaldada kogu sisu?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"Mandaatide salvestusruum tühjendati."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"Mandaatide salvestusruumi ei õnnestunud tühjendada."</string>
     <string name="forget" msgid="3971143908183848527">"Unusta"</string>
     <string name="connect" msgid="5861699594602380150">"Ühenda"</string>
     <string name="disconnect" msgid="6140789953324820336">"Katkesta  ühendus"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"See kustutab demokonto ja lähtestab süsteemi tehaseandmetele. Kõik kasutajaandmed lähevad kaotsi."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Välju demorežimist"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"LOOBU"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"Funktsioon pole sõidu ajal saadaval."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"Sõidu ajal ei saa kasutajat lisada."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"Funktsioon pole sõidu ajal saadaval"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"Sõidu ajal ei saa kasutajat lisada"</string>
 </resources>
diff --git a/res/values-eu/config.xml b/res/values-eu/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-eu/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 68074f1..69a3c3e 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -179,8 +179,8 @@
     <string name="bluetooth_ask_disablement" msgid="6056441896274912839">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioak Bluetooth konexioa desaktibatu nahi du"</string>
     <string name="bluetooth_ask_enablement_no_name" msgid="3191739265037605547">"Aplikazio batek Bluetooth konexioa aktibatu nahi du"</string>
     <string name="bluetooth_ask_disablement_no_name" msgid="5694464250599567283">"Aplikazio batek Bluetooth konexioa desaktibatu nahi du"</string>
-    <string name="bluetooth_ask_discovery" msgid="8774333095928068465">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioak gailu nagusia <xliff:g id="TIMEOUT">%2$d</xliff:g> segundoz ikusgai ezarri nahi du beste Bluetooth gailu batzuen aurrean."</string>
-    <string name="bluetooth_ask_discovery_no_name" msgid="164397600370102369">"Aplikazio batek gailu nagusia <xliff:g id="TIMEOUT">%1$d</xliff:g> segundoz ikusgai ezarri nahi du beste Bluetooth gailu batzuen aurrean."</string>
+    <string name="bluetooth_ask_discovery" msgid="8774333095928068465">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioak gailu nagusia <xliff:g id="TIMEOUT">%2$d</xliff:g> segundoz ikusgai ezarri nahi du Bluetooth bidezko beste gailu batzuen aurrean."</string>
+    <string name="bluetooth_ask_discovery_no_name" msgid="164397600370102369">"Aplikazio batek gailu nagusia <xliff:g id="TIMEOUT">%1$d</xliff:g> segundoz ikusgai ezarri nahi du Bluetooth bidezko beste gailu batzuen aurrean."</string>
     <string name="bluetooth_ask_enablement_and_discovery" msgid="5487502083015708674">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikazioak Bluetooth konexioa aktibatu eta gailu nagusia <xliff:g id="TIMEOUT">%2$d</xliff:g> segundoz ikusgai ezarri nahi du beste gailu batzuen aurrean."</string>
     <string name="bluetooth_ask_enablement_and_discovery_no_name" msgid="907153034209916282">"Aplikazio batek Bluetooth konexioa aktibatu eta gailu nagusia <xliff:g id="TIMEOUT">%1$d</xliff:g> segundoz ikusgai ezarri nahi du beste gailu batzuen aurrean."</string>
     <string name="bluetooth_notif_ticker" msgid="7192577740198156792">"Bluetooth bidez parekatzeko eskaera"</string>
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"Ez dago instalatuta erabiltzaile honentzat"</string>
     <string name="permissions_label" msgid="2701446753515612685">"Baimenak"</string>
     <string name="notifications_label" msgid="6586089149665170731">"Jakinarazpenak"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"Memoria eta cachea"</string>
     <string name="application_version_label" msgid="8556889839783311649">"Bertsioa: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"Ez du baimenik"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"Ez du eskatu baimenik"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s barneko memorian"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"Datuen erabilera"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"Aplik. datuen erabilera"</string>
     <string name="computing_size" msgid="5791407621793083965">"Kalkulatzen…"</string>
@@ -309,7 +311,7 @@
     <string name="autofill_add_service" msgid="6413893366443609951">"Gehitu zerbitzua"</string>
     <string name="app_launch_domain_links_title" msgid="774480184927726651">"Irekiko diren estekak"</string>
     <string name="domain_url_section_title" msgid="9070403140947787214">"Instalatutako aplikazioak"</string>
-    <string name="domain_urls_summary_none" msgid="3077803215088293183">"Ez ireki onartzen diren estekak"</string>
+    <string name="domain_urls_summary_none" msgid="3077803215088293183">"Ez ireki esteka bateragarriak"</string>
     <string name="domain_urls_summary_one" msgid="5072257421806034237">"Ireki <xliff:g id="DOMAIN">%s</xliff:g>"</string>
     <string name="domain_urls_summary_some" msgid="5523153458016701725">"Ireki <xliff:g id="DOMAIN">%s</xliff:g> eta beste URL batzuk"</string>
     <string name="app_launch_title" msgid="3442601467010363057">"Ireki modu lehenetsian"</string>
@@ -317,11 +319,11 @@
     <string name="auto_launch_disable_text" msgid="3595315315092716391">"Ez dago balio lehenetsirik ezarrita."</string>
     <string name="auto_launch_enable_text" msgid="7230832269574106901">"Ekintza batzuk egiterakoan aplikazioa modu lehenetsian abiaraztea aukeratu duzu."</string>
     <string name="auto_launch_reset_text" msgid="590439611312092392">"Garbitu balio lehenetsiak"</string>
-    <string name="app_launch_open_domain_urls_title" msgid="4705344946367759393">"Ireki onartzen diren estekak"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="4705344946367759393">"Ireki esteka bateragarriak"</string>
     <string name="app_link_open_always" msgid="5783167184335545230">"Ireki aplikazio honetan"</string>
     <string name="app_link_open_ask" msgid="7242075065136237456">"Galdetu beti"</string>
     <string name="app_link_open_never" msgid="2173174327831792316">"Ez ireki aplikazio honetan"</string>
-    <string name="app_launch_supported_domain_urls_title" msgid="7345116365785981158">"Onartzen diren estekak"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="7345116365785981158">"Esteka bateragarriak"</string>
     <string name="special_access" msgid="5730278220917123811">"Aplikazio-baimen bereziak"</string>
     <string name="show_system" msgid="4401355756969485287">"Erakutsi sistema"</string>
     <string name="hide_system" msgid="8845453295584638040">"Ezkutatu sistema"</string>
@@ -329,8 +331,8 @@
     <string name="modify_system_settings_description" msgid="5295023124419592452">"Baimen honekin, sistemaren ezarpenak alda ditzakete aplikazioek."</string>
     <string name="notification_access_title" msgid="1467340098885813473">"Jakinarazpenetarako sarbidea"</string>
     <string name="notification_listener_security_warning_title" msgid="2893273335175140895">"<xliff:g id="SERVICE">%1$s</xliff:g> zerbitzuari jakinarazpenetarako sarbidea eman nahi diozu?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="7280197998063498125">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> aplikazioak jakinarazpen guztiak irakurri ahal izango ditu, informazio pertsonala (adibidez, kontaktuen izenak eta jasotako testu-mezuak) dutenak barne. Horrez gain, jakinarazpenak baztertu eta haietako ekintza-botoiak abiarazi ahal izango ditu.\n\nGainera, Ez molestatu modua aktibatzeko eta desaktibatzeko aukera izango du aplikazioak, baita horrekin erlazionatutako ezarpenak aldatzekoa ere."</string>
-    <string name="notification_listener_revoke_warning_summary" msgid="4904973394539125407">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> aplikazioari jakinarazpenak atzitzeko aukera desaktibatzen badiozu, baliteke Ez molestatu modurako sarbidea era desaktibatzea."</string>
+    <string name="notification_listener_security_warning_summary" msgid="7280197998063498125">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> aplikazioak jakinarazpen guztiak irakurri ahal izango ditu, informazio pertsonala (adibidez, kontaktuen izenak eta jasotako testu-mezuak) dutenak barne. Horrez gain, jakinarazpenak baztertu eta haietako ekintza-botoiak abiarazi ahal izango ditu.\n\nGainera, ez molestatzeko modua aktibatzeko eta desaktibatzeko aukera izango du aplikazioak, baita horrekin erlazionatutako ezarpenak aldatzekoa ere."</string>
+    <string name="notification_listener_revoke_warning_summary" msgid="4904973394539125407">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> aplikazioari jakinarazpenak atzitzeko aukera desaktibatzen badiozu, baliteke ez molestatzeko modurako sarbidea era desaktibatzea."</string>
     <string name="notification_listener_revoke_warning_confirm" msgid="2759583507454984812">"Desaktibatu"</string>
     <string name="notification_listener_revoke_warning_cancel" msgid="4399941651358241154">"Utzi"</string>
     <string name="premium_sms_access_title" msgid="1409118461646148686">"Premium SMSetarako sarbidea"</string>
@@ -338,18 +340,13 @@
     <string name="usage_access_title" msgid="7153427122072303254">"Erabilera-datuetarako sarbidea"</string>
     <string name="usage_access_description" msgid="2413168719257435422">"Erabilera-datuek zer beste aplikazio eta zer maiztasunekin erabiltzen dituzun jakiteko baimena ematen die aplikazioei, baita zer operadore duzun, zer hizkuntza-ezarpen dituzun eta beste xehetasun batzuk ere."</string>
     <string name="wifi_control_title" msgid="5660436566907731929">"Wifi-konexioa kontrolatzea"</string>
-    <string name="wifi_control_description" msgid="6021926850423169261">"Wifia kontrolatzeko baimenarekin, aplikazioak hauek egin ditzake: wifi-konexioa aktibatu edo desaktibatu, wifi-sareak bilatu eta haietara konektatu, sareak gehitu edo kendu, edota sare publiko lokalak sortu."</string>
+    <string name="wifi_control_description" msgid="6021926850423169261">"Wifi-konexioa kontrolatzeko aukerarekin, aplikazioak hauek egin ditzake: wifi-konexioa aktibatu edo desaktibatu, wifi-sareak bilatu eta haietara konektatu, sareak gehitu edo kendu, edota sare publiko lokalak sortu."</string>
     <string name="more_special_access_title" msgid="166115485446645971">"Gehiago"</string>
     <string name="location_settings_title" msgid="901334356682423679">"Kokapena"</string>
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"Azken kokapen-eskaerak"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"Ez da egin kokapen-eskaerarik azkenaldian"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"Aplikazio-mailako baimenak"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"Bilaketa"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"Kokapen-zerbitzuak"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Wifi-sareen bilaketa"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Eman wifi-sareak edozein unetan bilatzeko baimena aplikazioei eta zerbitzuei, baita wifi-konexioa desaktibatuta dagoenean ere. Kokapenean oinarritutako eginbideak eta zerbitzuak hobetzeko erabil daiteke hori, besteak beste."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"Bluetooth gailuak bilatzea"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"Eman inguruko gailuak edozein unetan bilatzeko baimena aplikazioei eta zerbitzuei, baita Bluetooth konexioa desaktibatuta dagoenean ere. Kokapenean oinarritutako eginbideak eta zerbitzuak hobetzeko erabil daiteke hori, besteak beste."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"Sistema"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"Sistemaren eguneratzeak"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Android bertsioa"</string>
@@ -518,8 +515,8 @@
     <string name="really_remove_account_message" msgid="4296769280849579900">"Kontua kentzen baduzu, bertako mezu, kontaktu eta bestelako datu guztiak ezabatuko dira gailutik."</string>
     <string name="remove_account_error_title" msgid="8368044943174826635">"Ezin izan da kendu kontua."</string>
     <string name="account_sync_title" msgid="6541844336300236915">"Kontuaren sinkronizazioa"</string>
-    <string name="account_sync_summary_some_on" msgid="4525960296068027182">"<xliff:g id="ID_1">%1$d</xliff:g>/<xliff:g id="ID_2">%2$d</xliff:g> elementuk aktibatuta dute sinkronizazioa"</string>
-    <string name="account_sync_summary_all_on" msgid="3652264471870312725">"Elementu guztiek aktibatuta dute sinkronizazioa"</string>
+    <string name="account_sync_summary_some_on" msgid="4525960296068027182">"<xliff:g id="ID_1">%1$d</xliff:g>/<xliff:g id="ID_2">%2$d</xliff:g> elementuk aktibatuta daukate sinkronizazioa"</string>
+    <string name="account_sync_summary_all_on" msgid="3652264471870312725">"Elementu guztiek aktibatuta daukate sinkronizazioa"</string>
     <string name="account_sync_summary_all_off" msgid="6550959714035312414">"Elementu guztiek desaktibatuta dute sinkronizazioa"</string>
     <string name="sync_disabled" msgid="393531064334628258">"Sinkroniz. DESAKTIBATUTA"</string>
     <string name="sync_error" msgid="6698021343089247914">"Sinkronizazio-errorea"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> gailuaren harpidetzeak huts egin du"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"Gailu fidagarri bat gehitzen baduzu, autentifikazio-metodo bat ezartzea izango da hurrengo urratsa. Ez badaukazu gailu fidagarririk gertu, sistemak autentifikatzeko eskatuko dizu profila atzitzen duzunean."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"Gailu deskonektatu egin da."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"Garbitu kredentzialak"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"Kendu ziurtagiri guztiak"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"Eduki guztiak kendu nahi dituzu?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"Ezabatu dira kredentzialen biltegiaren datuak."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"Ezin izan dira ezabatu kredentzialen biltegiaren datuak."</string>
     <string name="forget" msgid="3971143908183848527">"Ahaztu"</string>
     <string name="connect" msgid="5861699594602380150">"Konektatu"</string>
     <string name="disconnect" msgid="6140789953324820336">"Deskonektatu"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Demo kontua ezabatuko da eta sistemaren jatorrizko datuak berrezarriko dira. Erabiltzaile-datu guztiak galdu egingo dira."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Irten demo modutik"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"BAZTERTU"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"Eginbide hau ezin da erabili gidatu bitartean."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"Gidatu bitartean ezin da gehitu erabiltzailerik."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"Eginbide hau ezin da erabili gidatu bitartean"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"Gidatu bitartean ezin da gehitu erabiltzailerik"</string>
 </resources>
diff --git a/res/values-fa/config.xml b/res/values-fa/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-fa/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 103e542..4c70f33 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"برای این کاربر نصب نشده است"</string>
     <string name="permissions_label" msgid="2701446753515612685">"مجوزها"</string>
     <string name="notifications_label" msgid="6586089149665170731">"اعلان‌ها"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"فضای ذخیره‌سازی و حافظه پنهان"</string>
     <string name="application_version_label" msgid="8556889839783311649">"نسخه: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"اجازه‌ای داده نشده"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"اجازه‌ای درخواست نشده"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s در حافظه داخلی"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"مصرف داده"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"مصرف داده برنامه"</string>
     <string name="computing_size" msgid="5791407621793083965">"درحال محاسبه..."</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"درخواست‌های اخیر مکان"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"درخواست مکان جدیدی وجود ندارد"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"مجوزهای سطح برنامه"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"اسکن کردن"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"خدمات مکان"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"اسکن کردن Wi‑Fi"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"به برنامه‌ها و سرویس‌ها اجازه دهید درهر زمانی (حتی وقتی Wi‑Fi خاموش است) شبکه‌های Wi‑Fi را اسکن کنند. برای مثال این مورد مي‌تواند برای بهبود ویژگی‌ها و سرویس‌های مکان‌مبنا استفاده شود."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"اسکن کردن بلوتوث"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"به برنامه‌ها و سرویس‌ها اجازه دهید درهر زمانی (حتی وقتی «بلوتوث» خاموش است) دستگاه‌های اطراف را اسکن کنند. برای مثال این مورد مي‌تواند برای بهبود ویژگی‌ها و سرویس‌های مکان‌مبنا استفاده شود."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"سیستم"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"به‌روزرسانی‌های سیستم"</string>
     <string name="firmware_version" msgid="8491753744549309333">"نسخه Android"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"ثبت‌نام <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ناموفق بود"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"افزودن دستگاه مطمئن مستلزم تنظیم روش احراز هویت در مرحله بعد است. اگر دستگاه مطمئن‌تان را با خود حمل نمی‌کنید، برای دسترسی به نمایه‌تان باید احراز هویت کنید."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"ارتباط دستگاه قطع شد."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"پاک کردن اطلاعات کاربری"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"حذف تمام گواهی‌ها"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"همه محتوا حذف شود؟"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"حافظه اطلاعات کاربری پاک شد."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"حافظه اطلاعات کاربری پاک نمی‌شود."</string>
     <string name="forget" msgid="3971143908183848527">"فراموش کردن"</string>
     <string name="connect" msgid="5861699594602380150">"اتصال"</string>
     <string name="disconnect" msgid="6140789953324820336">"قطع اتصال"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"با این کار حساب نمایشی حذف و سیستم به داده‌های کارخانه بازنشانی می‌شود. همه داده‌های کاربر از بین می‌روند."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"خروج از حالت نمایشی"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"رد کردن"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"هنگام رانندگی، این ویژگی در دسترس نیست."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"نمی‌توان هنگام رانندگی، کاربر اضافه کرد."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"این ویژگی هنگام رانندگی در دسترس نیست"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"نمی‌توان هنگام رانندگی کاربر اضافه کرد"</string>
 </resources>
diff --git a/res/values-fi/config.xml b/res/values-fi/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-fi/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 58f7620..c070c8b 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -269,7 +269,7 @@
     <string name="apps_and_notifications_settings" msgid="8704585874333781975">"Sovellukset ja ilmoitukset"</string>
     <string name="all_applications" msgid="7798210477486822168">"Näytä kaikki sovellukset"</string>
     <string name="default_applications" msgid="1558183275638697087">"Oletussovellukset"</string>
-    <string name="app_permissions" msgid="32799922508313948">"Sovelluksen käyttöoikeudet"</string>
+    <string name="app_permissions" msgid="32799922508313948">"Sovellusten käyttöoikeudet"</string>
     <string name="app_permissions_summary" msgid="1842858532315056367">"Sovellukset, joilla on lupa käyttää seuraavia: <xliff:g id="APPS">%1$s</xliff:g>"</string>
     <string name="applications_settings" msgid="794261395191035632">"Sovellustiedot"</string>
     <string name="force_stop" msgid="2153183697014720520">"Pakota sulkeutumaan"</string>
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"Ei asennettu tälle käyttäjälle"</string>
     <string name="permissions_label" msgid="2701446753515612685">"Käyttöoikeudet"</string>
     <string name="notifications_label" msgid="6586089149665170731">"Ilmoitukset"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"Tallennustila ja välimuisti"</string>
     <string name="application_version_label" msgid="8556889839783311649">"Versio: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"Käyttöoikeuksia ei ole myönnetty."</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"Käyttöoikeuksia ei ole pyydetty."</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s sisäisessä tallennustilassa"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"Datan käyttö"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"Sovelluksen datan käyttö"</string>
     <string name="computing_size" msgid="5791407621793083965">"Lasketaan…"</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"Viimeisimmät sijaintipyynnöt"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"Ei viimeaikaisia sijaintipyyntöjä"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"Sovellustason käyttöoikeudet"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"Hakeminen"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"Sijaintipalvelut"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Wi‑Fi-haku"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Salli sovellusten ja palvelujen hakea Wi‑Fi-verkkoja aina, vaikka Wi-Fi olisi pois käytöstä. Näin voidaan esimerkiksi kehittää sijaintiin perustuvia ominaisuuksia ja palveluja."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"Bluetooth-haku"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"Salli sovellusten ja palvelujen hakea lähellä olevia laitteita aina, vaikka Bluetooth olisi pois käytöstä. Näin voidaan esimerkiksi kehittää sijaintiin perustuvia ominaisuuksia ja palveluja."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"Järjestelmä"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"Järjestelmäpäivitykset"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Android-versio"</string>
@@ -406,7 +403,7 @@
     <string name="reset_network_confirm_button_text" msgid="5246859685069024851">"Nollaa asetukset"</string>
     <string name="reset_network_complete_toast" msgid="3804108209431416865">"Verkkoasetukset on nollattu"</string>
     <string name="reset_app_pref_title" msgid="5855420038951743992">"Nollaa sovellusasetukset"</string>
-    <string name="reset_app_pref_desc" msgid="579392665146962149">"Kaikki seuraavien asetukset nollataan:\n\n"<li>"Käytöstä poistetut sovellukset"</li>\n<li>"Käytöstä poistetut sovellusilmoitukset"</li>\n<li>"Toimintojen oletussovellukset"</li>\n<li>" Sovellusten taustadatan käyttörajoitukset"</li>\n<li>"Käyttöoikeusrajoitukset"</li>\n\n"Et menetä mitään sovellusten dataa."</string>
+    <string name="reset_app_pref_desc" msgid="579392665146962149">"Kaikki seuraavien asetukset nollataan:\n\n"<li>"Käytöstä poistetut sovellukset"</li>\n<li>"Käytöstä poistetut sovellusilmoitukset"</li>\n<li>"Toimintojen oletussovellukset"</li>\n<li>"Sovellusten taustadatan käyttörajoitukset"</li>\n<li>"Käyttöoikeusrajoitukset"</li>\n\n"Et menetä mitään sovellusten dataa."</string>
     <string name="reset_app_pref_button_text" msgid="6270820447321231609">"Nollaa sovellukset"</string>
     <string name="reset_app_pref_complete_toast" msgid="8709072932243594166">"Sovellusasetukset on nollattu"</string>
     <string name="master_clear_title" msgid="8515335233363214414">"Poista data (tehdasasetusten palautus)"</string>
@@ -438,7 +435,7 @@
     <string name="date_picker_title" msgid="1533614225273770178">"Päivämäärä"</string>
     <string name="time_picker_title" msgid="7436045944320504639">"Aika"</string>
     <string name="user_admin" msgid="1535484812908584809">"Järjestelmänvalvoja"</string>
-    <string name="signed_in_admin_user" msgid="1267225622818673274">"Järjestelmänvalvoja kirjautuneena"</string>
+    <string name="signed_in_admin_user" msgid="1267225622818673274">"Kirjautunut järjestelmänvalvojana"</string>
     <string name="grant_admin_permissions_title" msgid="4628430467359951437">"Kaikki järjestelmänvalvojan käyttöoikeudet"</string>
     <string name="grant_admin_permissions_button_text" msgid="988239414372882401">"Muuta järjestelmänvalvojaksi"</string>
     <string name="grant_admin_permissions_message" msgid="1751910369004774830">"Käyttäjä voi poistaa käyttäjiä, mukaan lukien muita järjestelmänvalvojia, ja palauttaa järjestelmän tehdasasetukset."</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"Liittyminen epäonnistui: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"Kun olet lisännyt luotetun laitteen, sinun on määritettävä todennustapa. Jos luotetut laitteet eivät ole mukanasi, pääset käyttämään profiilia todennustavan avulla."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"Ei yhteyttä laitteeseen"</string>
+    <string name="credentials_reset" msgid="873900550885788639">"Tyhjennä kirjautumistiedot"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"Poista kaikki varmenteet"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"Poistetaanko kaikki sisältö?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"Kirjautumistietojen tallennustila tyhjennettiin."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"Kirjautumistietojen tyhjennys epäonnistui."</string>
     <string name="forget" msgid="3971143908183848527">"Unohda"</string>
     <string name="connect" msgid="5861699594602380150">"Yhdistä"</string>
     <string name="disconnect" msgid="6140789953324820336">"Katkaise yhteys"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Tämä poistaa esittelytilin ja palauttaa järjestelmän tehdasasetukset. Kaikki käyttäjätiedot poistetaan."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Sulje esittely"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"OHITA"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"Ominaisuus ei ole käytettävissä ajon aikana."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"Käyttäjää ei voi lisätä ajon aikana."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"Ominaisuus ei ole käytettävissä ajon aikana"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"Käyttäjää ei voi lisätä ajon aikana"</string>
 </resources>
diff --git a/res/values-fr-rCA/config.xml b/res/values-fr-rCA/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-fr-rCA/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 9f4e4de..2c1b918 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"Non installée pour cet utilisateur"</string>
     <string name="permissions_label" msgid="2701446753515612685">"Autorisations"</string>
     <string name="notifications_label" msgid="6586089149665170731">"Notifications"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"Stockage et mise en cache"</string>
     <string name="application_version_label" msgid="8556889839783311649">"Version : %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"Aucune autorisation accordée"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"Aucune autorisation demandée"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s de mémoire de stockage interne"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"Utilisation des données"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"Util. données applications"</string>
     <string name="computing_size" msgid="5791407621793083965">"Traitement en cours…"</string>
@@ -343,13 +345,8 @@
     <string name="location_settings_title" msgid="901334356682423679">"Lieu"</string>
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"Récentes demandes de localisation"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"Aucune demande de localisation récente"</string>
-    <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"Autorisations à l\'échelle des applications"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"Recherche"</string>
+    <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"Autorisations à l\'échelle des applis"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"Services de localisation"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Recherche de réseaux Wi-Fi"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Autorisez les applications et les services à rechercher les réseaux Wi-Fi en tout temps, même lorsque le Wi-Fi est désactivé. Cette option peut, par exemple, être utilisée pour améliorer les fonctionnalités et les services qui utilisent la localisation."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"Recherche d\'appareils Bluetooth"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"Autorisez les applications et les services à rechercher les appareils à proximité en tout temps, même lorsque le Bluetooth est désactivé. Cette option peut, par exemple, être utilisée pour améliorer les fonctionnalités et les services qui utilisent la localisation."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"Système"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"Mises à jour système"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Version d\'Android"</string>
@@ -405,7 +402,7 @@
     <string name="reset_network_confirm_desc" msgid="7721698076856330212">"Réinitialiser tous les paramètres réseau? Cette action est irréversible."</string>
     <string name="reset_network_confirm_button_text" msgid="5246859685069024851">"Réinitialiser les paramètres"</string>
     <string name="reset_network_complete_toast" msgid="3804108209431416865">"Les paramètres réseau ont été réinitialisés"</string>
-    <string name="reset_app_pref_title" msgid="5855420038951743992">"Réinitial. préférences des applications"</string>
+    <string name="reset_app_pref_title" msgid="5855420038951743992">"Réinitial. préférences des applis"</string>
     <string name="reset_app_pref_desc" msgid="579392665146962149">"Cette opération réinitialise toutes les préférences relatives aux éléments suivants :\n\n"<li>"Applications désactivées"</li>\n<li>"Notifications associées aux applications désactivées"</li>\n<li>"Applications par défaut pour les actions"</li>\n<li>"Restrictions de données en arrière-plan pour les applications"</li>\n<li>"Toutes les restrictions d\'autorisations"</li>\n\n"Vous ne perdrez aucune donnée liée aux applications."</string>
     <string name="reset_app_pref_button_text" msgid="6270820447321231609">"Réinitialiser les applications"</string>
     <string name="reset_app_pref_complete_toast" msgid="8709072932243594166">"Les préférences des applications ont été réinitialisées"</string>
@@ -414,7 +411,7 @@
     <string name="master_clear_accounts" msgid="7797522012993567494">"Vous êtes actuellement connecté aux comptes suivants :"</string>
     <string name="master_clear_other_users_present" msgid="8383376863095743337">"D\'autres personnes utilisent ce véhicule."</string>
     <string name="master_clear_button_text" msgid="8010754220392741160">"Réinitialiser le véhicule"</string>
-    <string name="master_clear_confirm_title" msgid="8646455623132887370">"Effectuez la réinitialisation?"</string>
+    <string name="master_clear_confirm_title" msgid="8646455623132887370">"Réinitialiser?"</string>
     <string name="master_clear_confirm_desc" msgid="8920446291698038558">"Voulez-vous effacer toutes vos données personnelles et les applications que vous avez téléchargées? Cette action est irréversible!"</string>
     <string name="master_clear_confirm_button_text" msgid="7981254968588121786">"Tout effacer"</string>
     <string name="master_clear_progress_title" msgid="7087480656932674774">"Suppression en cours…"</string>
@@ -536,7 +533,7 @@
     <string name="security_lock_pattern" msgid="1174352995619563104">"Schéma"</string>
     <string name="security_lock_pin" msgid="4891899974369503200">"NIP"</string>
     <string name="security_lock_password" msgid="4420203740048322494">"Mot de passe"</string>
-    <string name="lock_settings_picker_title" msgid="6590330165050361632">"Choisissez un type de verrouillage"</string>
+    <string name="lock_settings_picker_title" msgid="6590330165050361632">"Choisir un type de verrouillage"</string>
     <string name="screen_lock_options" msgid="8531177937577168185">"Options de verrouillage"</string>
     <string name="lock_settings_enter_pattern" msgid="4826034565853171624">"Entrez votre schéma"</string>
     <string name="lockpattern_confirm_button_text" msgid="7784925958324484965">"Confirmer"</string>
@@ -622,7 +619,7 @@
     <string name="build_info_fmt" msgid="5592554123908086426">"<xliff:g id="FINGERPRINT">%1$s</xliff:g>\n<xliff:g id="DATE">%2$s</xliff:g> : il y a <xliff:g id="NUM_DAYS">%3$s</xliff:g> jours"</string>
     <string name="add_device_title" msgid="8452168024017866232">"Ajouter un appareil de confiance"</string>
     <string name="add_device_summary" msgid="5368217520710573302">"Bluetooth s\'activera pour ajout. app. confiance"</string>
-    <string name="trusted_device" msgid="5637378361866787603">"Appareils fiables"</string>
+    <string name="trusted_device" msgid="5637378361866787603">"Appareils de confiance"</string>
     <plurals name="trusted_device_subtitle" formatted="false" msgid="462041049834264945">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> appareil</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> appareils</item>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"Échec de l\'inscription de l\'appareil <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"L\'ajout d\'un appareil de confiance nécessite ensuite la configuration d\'une méthode d\'authentification. Si vous n\'avez pas votre appareil de confiance avec vous, un processus d\'authentification sera nécessaire pour accéder à votre profil."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"Appareil déconnecté."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"Effacer les authentifiants"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"Supprimer tous les certificats"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"Voulez-vous supprimer l\'intégralité du contenu?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"Le stockage des authentifiants est effacé."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"Impossible d\'effacer le stockage des authentifiants."</string>
     <string name="forget" msgid="3971143908183848527">"Oublier"</string>
     <string name="connect" msgid="5861699594602380150">"Connexion"</string>
     <string name="disconnect" msgid="6140789953324820336">"Déconnexion"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Cette action supprimera le compte de démonstration et réinitialisera le système. Toutes les données de l\'utilisateur seront perdues."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Quitter le mode démo"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"IGNORER"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"Cette fonction n\'est pas accessible durant la conduite."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"Impossible d\'ajouter un utilisateur pendant la conduite."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"Cette fonctionnalité n\'est pas accessible durant la conduite"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"Impossible d\'ajouter un utilisateur durant la conduite"</string>
 </resources>
diff --git a/res/values-fr/config.xml b/res/values-fr/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-fr/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 4a0b2b2..0928a94 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -269,7 +269,7 @@
     <string name="apps_and_notifications_settings" msgid="8704585874333781975">"Applications et notifications"</string>
     <string name="all_applications" msgid="7798210477486822168">"Afficher toutes les applications"</string>
     <string name="default_applications" msgid="1558183275638697087">"Applications par défaut"</string>
-    <string name="app_permissions" msgid="32799922508313948">"Autorisations de l\'application"</string>
+    <string name="app_permissions" msgid="32799922508313948">"Autorisations des applis"</string>
     <string name="app_permissions_summary" msgid="1842858532315056367">"Applications utilisant <xliff:g id="APPS">%1$s</xliff:g>"</string>
     <string name="applications_settings" msgid="794261395191035632">"Informations sur les applications"</string>
     <string name="force_stop" msgid="2153183697014720520">"Forcer l\'arrêt"</string>
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"Non installée pour cet utilisateur"</string>
     <string name="permissions_label" msgid="2701446753515612685">"Autorisations"</string>
     <string name="notifications_label" msgid="6586089149665170731">"Notifications"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"Espace de stockage et cache"</string>
     <string name="application_version_label" msgid="8556889839783311649">"Version %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"Aucune autorisation accordée"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"Aucune autorisation demandée"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s de mémoire de stockage interne"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"Consommation des données"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"Conso des données applis"</string>
     <string name="computing_size" msgid="5791407621793083965">"Calcul…"</string>
@@ -343,13 +345,8 @@
     <string name="location_settings_title" msgid="901334356682423679">"Position"</string>
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"Demandes de localisation récentes"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"Aucune demande de localisation récente"</string>
-    <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"Autorisations de l\'application"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"Recherche"</string>
+    <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"Autorisations des applis"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"Services de localisation"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Recherche Wi‑Fi"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Autoriser les applications et les services à rechercher des réseaux Wi-Fi à tout moment, même si le Wi-Fi est désactivé. Cette autorisation peut permettre, par ex., d\'améliorer les fonctionnalités et les services basés sur la localisation."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"Recherche Bluetooth"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"Autoriser les applications et les services à rechercher des appareils à proximité à tout moment, même si le Bluetooth est désactivé. Cette autorisation peut, par ex., améliorer les fonctionnalités et les services basés sur la localisation."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"Système"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"Mises à jour du système"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Version d\'Android"</string>
@@ -480,7 +477,7 @@
     <string name="edit_user_name_title" msgid="6890782937520262478">"Modifier le nom d\'utilisateur"</string>
     <string name="users_list_title" msgid="770764290290240909">"Utilisateurs"</string>
     <string name="user_details_admin_title" msgid="3530292857178371891">"Autorisations accordées à %1$s"</string>
-    <string name="storage_settings_title" msgid="8957054192781341797">"Espace de stockage"</string>
+    <string name="storage_settings_title" msgid="8957054192781341797">"Stockage"</string>
     <string name="storage_music_audio" msgid="7827147379976134040">"Musique et audio"</string>
     <string name="storage_other_apps" msgid="945509804756782640">"Autres applications"</string>
     <string name="storage_files" msgid="6382081694781340364">"Files"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"Échec de l\'inscription de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"Pour ajouter un appareil vérifié, vous devez définir une méthode d\'authentification à l\'étape suivante. Si vous n\'avez pas votre appareil vérifié avec vous, vous devrez obligatoirement passer par l\'étape d\'authentification pour accéder à votre profil."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"Appareil déconnecté."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"Effacer les identifiants"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"Supprimer tous les certificats"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"Supprimer l\'intégralité du contenu ?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"L\'espace de stockage des identifiants a été effacé."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"Impossible d\'effacer l\'espace de stockage des identifiants."</string>
     <string name="forget" msgid="3971143908183848527">"Supprimer"</string>
     <string name="connect" msgid="5861699594602380150">"Connecter"</string>
     <string name="disconnect" msgid="6140789953324820336">"Déconnecter"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Le compte de démonstration sera supprimé et la configuration d\'usine du système sera rétablie. Toutes les données utilisateur seront perdues."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Quitter la démo"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"IGNORER"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"Fonctionnalité non disponible lorsque vous conduisez."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"Impossible d\'ajouter un utilisateur pendant la conduite."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"Fonctionnalité non disponible lorsque vous conduisez"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"Impossible d\'ajouter un utilisateur pendant la conduite"</string>
 </resources>
diff --git a/res/values-gl/config.xml b/res/values-gl/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-gl/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index add7a89..6a99e54 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"Sen instalar para este usuario"</string>
     <string name="permissions_label" msgid="2701446753515612685">"Permisos"</string>
     <string name="notifications_label" msgid="6586089149665170731">"Notificacións"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"Almacenamento e memoria caché"</string>
     <string name="application_version_label" msgid="8556889839783311649">"Versión %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"Non se outorgou ningún permiso"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"Non se solicitou ningún permiso"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s de almacenamento interno"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"Uso de datos"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"Uso de datos da aplicación"</string>
     <string name="computing_size" msgid="5791407621793083965">"Calculando…"</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"Solicitudes de localización recentes"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"Non hai solicitudes de localización recentes"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"Permisos para as aplicacións"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"Busca de localizacións"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"Servizos de localización"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Busca de redes wifi"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Permite ás aplicacións e aos servizos buscar redes wifi en calquera momento, mesmo cando a wifi está desactivada. Esta opción pode utilizarse, por exemplo, para mellorar as funcións e os servizos baseados na localización."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"Busca de dispositivos Bluetooth"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"Permite ás aplicacións e aos servizos buscar dispositivos próximos en calquera momento, mesmo cando o Bluetooth está desactivado. Esta opción pode utilizarse, por exemplo, para mellorar as funcións e os servizos baseados na localización."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"Sistema"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"Actualizacións do sistema"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Versión de Android"</string>
@@ -363,7 +360,7 @@
     <string name="device_status_activity_title" msgid="4083567497305368200">"Estado"</string>
     <string name="device_status" msgid="267298179806290920">"Estado"</string>
     <string name="device_status_summary" product="tablet" msgid="600543254608862075">"Estado da batería, da rede e outra información"</string>
-    <string name="device_status_summary" product="default" msgid="9130360324418117815">"Número de teléfono, sinal, etc."</string>
+    <string name="device_status_summary" product="default" msgid="9130360324418117815">"Número de teléfono, sinal etc."</string>
     <string name="about_settings" msgid="4329457966672592345">"Acerca de"</string>
     <string name="about_summary" msgid="5374623866267691206">"Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="about_settings_summary" msgid="7975072809083281401">"Mostra información legal, o estado e a versión do software"</string>
@@ -495,7 +492,7 @@
     <string name="storage_clear_user_data_text" msgid="8787615136779130680">"Borrar almacenamento"</string>
     <string name="storage_clear_cache_btn_text" msgid="8449547925966775612">"Borrar caché"</string>
     <string name="storage_clear_data_dlg_title" msgid="5863775997588969879">"Eliminar os datos da aplicación?"</string>
-    <string name="storage_clear_data_dlg_text" msgid="795055288575727801">"Eliminaranse todos os datos desta aplicación permanentemente. Entre estes inclúense todos os ficheiros, opcións de configuracións, contas, bases de datos, etc."</string>
+    <string name="storage_clear_data_dlg_text" msgid="795055288575727801">"Eliminaranse todos os datos desta aplicación permanentemente. Entre estes inclúense todos os ficheiros, opcións de configuracións, contas, bases de datos etc."</string>
     <string name="storage_clear_failed_dlg_text" msgid="6710485971686866306">"Non se puido borrar o almacenamento da aplicación."</string>
     <string name="storage_unmount_success" msgid="1553591517580407021">"<xliff:g id="NAME">%1$s</xliff:g>: expulsouse con seguranza"</string>
     <string name="storage_unmount_failure" msgid="4591934911541762883">"<xliff:g id="NAME">%1$s</xliff:g>: non se puido expulsar con seguranza"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"Produciuse un erro durante a inscrición de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"Se engades un dispositivo de confianza, despois terás que definir un método de autenticación. Se non tes á man o dispositivo de confianza, deberás verificar a túa identidade para acceder ao teu perfil."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"Desconectouse o dispositivo."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"Borrar credenciais"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"Elimina todos os certificados"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"Queres quitar todo o contido?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"Borrouse o almacenamento de credenciais."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"Non se puido borrar o almacenamento de credenciais."</string>
     <string name="forget" msgid="3971143908183848527">"Borrar"</string>
     <string name="connect" msgid="5861699594602380150">"Conectar"</string>
     <string name="disconnect" msgid="6140789953324820336">"Desconectar"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Con esta acción eliminarase a conta de demostración e restableceranse os datos de fábrica do sistema. Perderanse todos os datos do usuario."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Saír da demostración"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"IGNORAR"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"Esta función non está dispoñible mentres conduces."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"Non se poden engadir usuarios mentres se conduce."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"Esta función non está dispoñible mentres conduces"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"Non se poden engadir usuarios mentres se conduce"</string>
 </resources>
diff --git a/res/values-gu/config.xml b/res/values-gu/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-gu/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 0cdc970..3ba993b 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"આ વપરાશકર્તા માટે ઇન્સ્ટૉલ કરી નથી"</string>
     <string name="permissions_label" msgid="2701446753515612685">"પરવાનગીઓ"</string>
     <string name="notifications_label" msgid="6586089149665170731">"નોટિફિકેશન"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"સ્ટોરેજ અને કૅશ મેમરી"</string>
     <string name="application_version_label" msgid="8556889839783311649">"વર્ઝન: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"કોઈ પરવાનગીઓ આપેલ નથી"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"કોઈ પરવાનગીઓની વિનંતી કરેલ નથી"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s આંતરિક સ્ટોરેજમાં"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"ડેટા વપરાશ"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"ઍપ ડેટા વપરાશ"</string>
     <string name="computing_size" msgid="5791407621793083965">"ગણતરી કરી રહ્યાં છીએ…"</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"સ્થાન માટે તાજેતરની વિનંતીઓ"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"સ્થાન માટે તાજેતરમાં કોઈ વિનંતી નથી"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"ઍપ લેવલની પરવાનગીઓ"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"સ્કૅનિંગ"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"જગ્યાની સેવાઓ"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"વાઇ-ફાઇ સ્કૅનિંગ"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"જ્યારે વાઇ-ફાઇ બંધ હોય ત્યારે પણ ગમે ત્યારે ઍપ અને સેવાઓને વાઇ-ફાઇ નેટવર્ક સ્કૅન કરવાની મંજૂરી આપો. ઉદાહરણ તરીકે, આનો ઉપયોગ સ્થાન આધારિત સુવિધાઓ અને સેવાઓને વધુ સારી બનાવવા માટે કરી શકાય છે."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"બ્લૂટૂથ સ્કૅનિંગ"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"જ્યારે બ્લૂટૂથ બંધ હોય ત્યારે પણ ગમે ત્યારે ઍપ અને સેવાઓને નજીકનાં ડિવાઇસ સ્કૅન કરવાની મંજૂરી આપો. ઉદાહરણ તરીકે, આનો ઉપયોગ સ્થાન આધારિત સુવિધાઓ અને સેવાઓને વધુ સારી બનાવવા માટે કરી શકાય છે."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"સિસ્ટમ"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"સિસ્ટમ અપડેટ"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Android વર્ઝન"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>ની નોંધણી નિષ્ફળ રહી"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"કોઈ વિશ્વસનીય ડિવાઇસ ઉમેરવા માટે, તમારે પહેલાં કોઈ પ્રમાણીકરણ પદ્ધતિ સેટ કરવી આવશ્યક છે. જો તમારી પાસે તમારું વિશ્વસનીય ડિવાઇસ ન હોય, તો તમારી પ્રોફાઇલને ઍક્સેસ કરવા માટે પ્રમાણીકરણ આવશ્યક રહેશે."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"ડિવાઇસ ડિસ્કનેક્ટ થયું."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"લૉગ ઇન વિગતોને સાફ કરો"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"બધા પ્રમાણપત્ર કાઢી નાખો"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"બધું કન્ટેન્ટ કાઢી નાખીએ?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"ક્રિડેન્શ્યલ સ્ટોરેજ કાઢી નાખ્યું છે."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"ક્રિડેન્શ્યલ સ્ટોરેજ કાઢી નાખી શકાયું નથી."</string>
     <string name="forget" msgid="3971143908183848527">"ભૂલી જાઓ"</string>
     <string name="connect" msgid="5861699594602380150">"કનેક્ટ કરો"</string>
     <string name="disconnect" msgid="6140789953324820336">"ડિસ્કનેક્ટ કરો"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"આ ક્રિયા ડેમો એકાઉન્ટ ડિલીટ કરશે અને સિસ્ટમને ફેક્ટરી ડેટા પર રીસેટ કરશે. વપરાશકર્તાનો બધો ડેટા ગુમ થશે."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"ડેમોમાંથી બહાર નીકળો"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"છોડી દો"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"ડ્રાઇવિંગ કરતી વખતે આ સુવિધા ઉપલબ્ધ રહેશે નહીં."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"ડ્રાઇવ કરતી વખતે વપરાશકર્તાને ઉમેરી શકાતા નથી."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"ડ્રાઇવિંગ કરતી વખતે આ સુવિધા ઉપલબ્ધ નથી"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"ડ્રાઇવ કરતી વખતે વપરાશકર્તાને ઉમેરી શકાતા નથી"</string>
 </resources>
diff --git a/res/values-hi/config.xml b/res/values-hi/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-hi/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 30c95d3..9530d17 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"इस उपयोगकर्ता के लिए इंस्टॉल नहीं किया गया"</string>
     <string name="permissions_label" msgid="2701446753515612685">"अनुमतियां"</string>
     <string name="notifications_label" msgid="6586089149665170731">"सूचनाएं"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"मेमोरी और कैश"</string>
     <string name="application_version_label" msgid="8556889839783311649">"वर्शन: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"कोई अनुमति नहीं दी गई"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"किसी अनुमति का अनुरोध नहीं किया गया"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"डिवाइस की मेमोरी में %s है"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"डेटा खर्च"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"ऐप्लिकेशन का डेटा खर्च"</string>
     <string name="computing_size" msgid="5791407621793083965">"गिनती की जा रही है…"</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"हाल ही में किए गए जगह के अनुरोध"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"हाल ही में जगह का कोई अनुरोध नहीं है"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"ऐप्लिकेशन-स्तर की अनुमतियां"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"स्‍कैन करना"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"जगह की जानकारी की सेवाएं"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"वाई-फ़ाई स्कैन करना"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"ऐप्लिकेशन और सेवाओं को किसी भी समय वाई-फ़ाई नेटवर्क स्कैन करने की मंज़ूरी दें, भले ही वाई-फ़ाई बंद हो. इसका इस्तेमाल करके, जगह की जानकारी जैसी सुविधाओं और सेवाओं में सुधार किया जा सकता है."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"ब्लूटूथ स्कैन करना"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"ऐप्लिकेशन और सेवाओं को किसी भी समय आस-पास के डिवाइस स्कैन करने की मंज़ूरी दें, भले ही ब्लूटूथ बंद हो. इसका इस्तेमाल करके, जगह की जानकारी जैसी सुविधाओं और सेवाओं में सुधार किया जा सकता है."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"सिस्टम"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"सिस्टम अपडेट"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Android का वर्शन"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> का नाम दर्ज नहीं हो सका"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"इसके बाद एक भरोसेमंद डिवाइस जोड़ने के लिए आपको पुष्टि करने का तरीका सेट करना होगा. अगर भरोसेमंद डिवाइस आपके पास नहीं है, तो आपकी प्रोफ़ाइल ऐक्सेस करने के लिए पुष्टि करना ज़रूरी होगा."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"डिवाइस डिसकनेक्ट किया गया."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"क्रेडेंशियल मिटाएं"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"सभी प्रमाणपत्र हटाएं"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"सभी सामग्री हटाएं?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"क्रेडेंशियल स्टोरेज हमेशा के लिए मिटाई गई."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"क्रेडेंशियल स्टोरेज हमेशा के लिए नहीं मिटाई जा सकती."</string>
     <string name="forget" msgid="3971143908183848527">"भूल जाएं"</string>
     <string name="connect" msgid="5861699594602380150">"कनेक्शन जोड़ें"</string>
     <string name="disconnect" msgid="6140789953324820336">"कनेक्शन हटाएं"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"डेमो मोड से बाहर निकलने पर, डेमो खाता मिट जाएगा और सिस्टम का डेटा फ़ैक्ट्री रीसेट हो जाएगा. साथ ही, उपयोगकर्ता का पूरा डेटा भी मिट जाएगा."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"डेमो मोड से बाहर निकलें"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"खारिज करें"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"गाड़ी चलाते समय इस सुविधा का इस्तेमाल नहीं किया जा सकता."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"गाड़ी चलाते समय उपयोगकर्ता को जोड़ा नहीं जा सकता."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"गाड़ी चलाते समय इस सुविधा का इस्तेमाल नहीं किया जा सकता"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"गाड़ी चलाते समय किसी उपयोगकर्ता को नहीं जोड़ा जा सकता"</string>
 </resources>
diff --git a/res/values-hr/config.xml b/res/values-hr/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-hr/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index b72c927..2a14d9f 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -285,9 +285,11 @@
     <string name="not_installed" msgid="4218816013370552746">"Nije instalirano za ovog korisnika"</string>
     <string name="permissions_label" msgid="2701446753515612685">"Dopuštenja"</string>
     <string name="notifications_label" msgid="6586089149665170731">"Obavijesti"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"Pohrana i predmemorija"</string>
     <string name="application_version_label" msgid="8556889839783311649">"Verzija: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"Nije odobreno nijedno dopuštenje"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"Nije zatraženo nijedno dopuštenje"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s u internoj pohrani"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"Potrošnja podataka"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"Potrošnja podatkovnog prometa za aplikacije"</string>
     <string name="computing_size" msgid="5791407621793083965">"Izračunavanje..."</string>
@@ -347,12 +349,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"Nedavni zahtjevi za lokaciju"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"Nema nedavnih zahtjeva za lokaciju"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"Dopuštenja na razini aplikacije"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"Traženje"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"Usluge lokacije"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Traženje Wi‑Fija"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Dopustite aplikacijama i uslugama da traže Wi‑Fi mreže u bilo kojem trenutku, čak i kada je Wi‑Fi isključen. Na taj se način mogu, na primjer, poboljšati značajke i usluge koje se temelje na lokaciji."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"Traženje Bluetootha"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"Dopustite aplikacijama i uslugama da traže uređaje u blizini u bilo kojem trenutku, čak i kada je Bluetooth isključen. Na taj se način mogu, na primjer, poboljšati značajke i usluge koje se temelje na lokaciji."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"Sustav"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"Ažuriranja sustava"</string>
     <string name="firmware_version" msgid="8491753744549309333">"verziju Androida"</string>
@@ -652,6 +649,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"Upis uređaja <xliff:g id="DEVICE_NAME">%1$s</xliff:g> nije uspio"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"Nakon što dodate pouzdani uređaj, morate postaviti način autentifikacije. Ako nemate pouzdani uređaj sa sobom, morat ćete se autentificirati da biste pristupili svojem profilu."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"Uređaj je isključen."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"Izbriši vjerodajnice"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"Ukloni sve certifikate"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"Ukloniti sve sadržaje?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"Izbrisan je spremnik vjerodajnica."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"Spremnik vjerodajnica nije izbrisan."</string>
     <string name="forget" msgid="3971143908183848527">"Zaboravi"</string>
     <string name="connect" msgid="5861699594602380150">"Poveži"</string>
     <string name="disconnect" msgid="6140789953324820336">"Prekini vezu"</string>
@@ -667,6 +669,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Time će se izbrisati demo-račun, a sustav će se vratiti na tvorničko stanje. Svi će se podaci korisnika izgubiti."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Napustite demo-način"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"ODBACI"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"Značajka nije dostupna tijekom vožnje."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"Nije moguće dodati korisnika tijekom vožnje."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"Značajka nije dostupna tijekom vožnje"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"Ne možete dodati korisnika tijekom vožnje"</string>
 </resources>
diff --git a/res/values-hu/config.xml b/res/values-hu/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-hu/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 7c44aef..8bd1568 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"Nincs telepítve ennél a felhasználónál"</string>
     <string name="permissions_label" msgid="2701446753515612685">"Engedélyek"</string>
     <string name="notifications_label" msgid="6586089149665170731">"Értesítések"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"Tárhely és gyorsítótár"</string>
     <string name="application_version_label" msgid="8556889839783311649">"Verzió: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"Nincsenek megadott engedélyek"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"Nincsenek kért engedélyek"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s a belső tárhelyen"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"Adathasználat"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"Alkalmazás adathasználata"</string>
     <string name="computing_size" msgid="5791407621793083965">"Számítás…"</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"Legutóbbi helylekérdezések"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"Nincsenek friss helylekérdezések"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"Alkalmazásszintű engedélyek"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"Keresés"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"Helyszolgáltatások"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Wi‑Fi-alapú keresés"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Engedélyezi az alkalmazásoknak és szolgáltatásoknak, hogy Wi-Fi-hálózatokat keressenek még akkor is, ha ki van kapcsolva a Wi-Fi. Ez például a helyalapú funkciók és szolgáltatások javítására használható."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"Bluetooth-alapú keresés"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"Engedélyezi az alkalmazásoknak és szolgáltatásoknak, hogy közeli eszközöket keressenek még akkor is, ha ki van kapcsolva a Bluetooth. Ez például a helyalapú funkciók és szolgáltatások javítására használható."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"Rendszer"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"Rendszerfrissítések"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Android-verzió"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"Nem sikerült a(z) <xliff:g id="DEVICE_NAME">%1$s</xliff:g> regisztrációja"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"Ha megbízható eszközt szeretne hozzáadni, akkor a következő lépésben hitelesítési módot kell megadnia. Ha nincs Önnél megbízható eszköze, hitelesítésre lesz szükség a profiljához való hozzáféréshez."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"Eszköz leválasztva."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"Hitelesítési adatok törlése"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"Összes tanúsítvány eltávolítása"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"Eltávolítja az összes tartalmat?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"Hitelesítési adatok tárolója ürítve."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"Nem sikerült üríteni a hitelesítési adatok tárolóját."</string>
     <string name="forget" msgid="3971143908183848527">"Elfelejtés"</string>
     <string name="connect" msgid="5861699594602380150">"Csatlakozás"</string>
     <string name="disconnect" msgid="6140789953324820336">"Leválasztás"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Ez törli a demófiókot, és visszaállítja a rendszer gyári adatait. Az összes felhasználói adat elveszik."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Kilépés a demóból"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"ELVETÉS"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"Vezetés közben nem áll rendelkezésre a funkció."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"Vezetés közben nem lehet hozzáadni felhasználót."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"Vezetés közben nem áll rendelkezésre a funkció"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"Vezetés közben nem lehet hozzáadni felhasználót"</string>
 </resources>
diff --git a/res/values-hy/config.xml b/res/values-hy/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-hy/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 4e18f61..fddc50d 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"Տեղադրված չէ այս օգտատիրոջ համար"</string>
     <string name="permissions_label" msgid="2701446753515612685">"Թույլտվություններ"</string>
     <string name="notifications_label" msgid="6586089149665170731">"Ծանուցումներ"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"Հիշողություն և քեշ"</string>
     <string name="application_version_label" msgid="8556889839783311649">"Տարբերակ՝ %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"Թույլտվություններ չեն տրվել"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"Թույլտվությունների հարցում չի արվել"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s տարածք ներքին հիշողությունում"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"Թրաֆիկի օգտագործում"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"Հավելվածի թրաֆիկ"</string>
     <string name="computing_size" msgid="5791407621793083965">"Հաշվարկում…"</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"Տեղադրության տվյալների վերջին հարցումները"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"Վերջերս տեղորոշման տվյալների հարցումներ չեն արվել"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"Հավելվածի թույլտվություններ"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"Որոնում"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"Տեղորոշման ծառայություններ"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Wi‑Fi ցանցերի որոնում"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Թույլ տալ հավելվածներին և ծառայություններին որոնել Wi‑Fi ցանցեր, նույնիսկ երբ Wi-Fi-ն անջատած է: Դա կարող է բարելավել տեղորոշում օգտագործող գործառույթների և ծառայությունների որակը։"</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"Bluetooth սարքերի որոնում"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"Թույլ տալ հավելվածներին և ծառայություններին որոնել մոտակայքում գտնվող սարքեր, նույնիսկ եթե Bluetooth-ն անջատած է: Դա կարող է բարելավել տեղորոշում օգտագործող գործառույթների և ծառայությունների որակը։"</string>
     <string name="system_setting_title" msgid="6864599341809463440">"Համակարգ"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"Համակարգի թարմացումներ"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Android-ի տարբերակը"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"Չհաջողվեց գրանցել «<xliff:g id="DEVICE_NAME">%1$s</xliff:g>» սարքը"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"Վստահելի սարք ավելացնելու համար ընտրեք նույնականացման եղանակ: Եթե վստահելի սարքը ձեզ մոտ չէ, պրոֆիլ մուտք գործելու համար կպահանջվի նույնականացում:"</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"Սարքն անջատված է։"</string>
+    <string name="credentials_reset" msgid="873900550885788639">"Ջնջել հավաստագրերը"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"Հեռացնել բոլոր հավաստագրերը"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"Հեռացնե՞լ ողջ բովանդակությունը:"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"Հավաստագրերի պահոցը մաքրվեց:"</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"Չհաջողվեց մաքրել հավաստագրերի պահոցը:"</string>
     <string name="forget" msgid="3971143908183848527">"Հեռացնել"</string>
     <string name="connect" msgid="5861699594602380150">"Միանալ"</string>
     <string name="disconnect" msgid="6140789953324820336">"Անջատել"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Դեմո հաշիվը կջնջվի, և համակարգում կվերականգնվեն գործարանային տվյալները։ Օգտատիրոջ բոլոր տվյալները կկորչեն։"</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Անջատել դեմո ռեժիմը"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"ՓԱԿԵԼ"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"Վարելու ընթացքում գործառույթը հասանելի չէ:"</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"Վարելու ժամանակ հնարավոր չէ օգտատեր ավելացնել:"</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"Վարելու ընթացքում գործառույթը հասանելի չէ"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"Վարելու ժամանակ հնարավոր չէ օգտատեր ավելացնել"</string>
 </resources>
diff --git a/res/values-in/config.xml b/res/values-in/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-in/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index f860097..665ab33 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"Tidak diinstal untuk pengguna ini"</string>
     <string name="permissions_label" msgid="2701446753515612685">"Izin"</string>
     <string name="notifications_label" msgid="6586089149665170731">"Notifikasi"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"Penyimpanan &amp; cache"</string>
     <string name="application_version_label" msgid="8556889839783311649">"Versi: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"Tidak ada izin yang diberikan"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"Tidak ada izin yang diminta"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s di penyimpanan internal"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"Penggunaan data"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"Penggunaan kuota aplikasi"</string>
     <string name="computing_size" msgid="5791407621793083965">"Menghitung..."</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"Permintaan Lokasi Terbaru"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"Tidak ada permintaan lokasi terbaru"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"Izin tingkat aplikasi"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"Pemindaian"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"Layanan Lokasi"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Pemindaian Wi-Fi"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Izinkan aplikasi dan layanan memindai jaringan Wi-Fi kapan saja, meskipun Wi-Fi nonaktif. Hal ini dapat dilakukan, misalnya, untuk menyempurnakan fitur dan layanan berbasis lokasi."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"Pemindaian Bluetooth"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"Izinkan aplikasi dan layanan memindai perangkat di sekitar kapan saja, meskipun Bluetooth nonaktif. Hal ini dapat dilakukan, misalnya, untuk menyempurnakan fitur dan layanan berbasis lokasi."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"Sistem"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"Update sistem"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Versi Android"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"Pendaftaran <xliff:g id="DEVICE_NAME">%1$s</xliff:g> gagal"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"Menambahkan perangkat dipercaya mewajibkan Anda menetapkan metode autentikasi setelahnya. Jika Anda tidak membawa perangkat dipercaya, autentikasi akan diperlukan untuk mengakses profil Anda."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"Perangkat tidak terhubung."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"Hapus kredensial"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"Hapus semua sertifikat"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"Hapus semua konten?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"Penyimpanan kredensial dihapus."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"Penyimpanan kredensial tidak dapat dihapus."</string>
     <string name="forget" msgid="3971143908183848527">"Lupakan"</string>
     <string name="connect" msgid="5861699594602380150">"Hubungkan"</string>
     <string name="disconnect" msgid="6140789953324820336">"Putuskan hubungan"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Tindakan ini akan menghapus akun demo dan mereset sistem ke setelan pabrik. Semua data pengguna akan hilang."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Keluar dari Demo"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"TOLAK"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"Fitur tidak tersedia saat mengemudi."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"Tidak dapat menambahkan pengguna saat mengemudi."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"Fitur tidak tersedia saat mengemudi"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"Tidak dapat menambahkan pengguna saat mengemudi"</string>
 </resources>
diff --git a/res/values-is/config.xml b/res/values-is/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-is/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 8cb04dc..b5ddb8e 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"Ekki uppsett fyrir þennan notanda"</string>
     <string name="permissions_label" msgid="2701446753515612685">"Heimildir"</string>
     <string name="notifications_label" msgid="6586089149665170731">"Tilkynningar"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"Geymslurými og skyndiminni"</string>
     <string name="application_version_label" msgid="8556889839783311649">"Útgáfa: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"Engar heimildir veittar"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"Engar heimildarbeiðnir"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s í innbyggðri geymslu"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"Gagnanotkun"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"Gagnanotkun forrits"</string>
     <string name="computing_size" msgid="5791407621793083965">"Reiknar…"</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"Nýlegar staðsetningarbeiðnir"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"Engar nýlegar staðsetningarbeiðnir"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"Heimildir á forritsstigi"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"Skönnun"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"Staðsetningarþjónusta"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Wi-Fi leit"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Leyfa forritum og þjónustu að leita að Wi-Fi netum hvenær sem er, jafnvel þegar slökkt er á Wi-Fi. Sem dæmi er hægt að nota þetta til að bæta eiginleika og þjónustu sem byggja á staðsetningu."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"Bluetooth-leit"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"Leyfa forritum og þjónustu að leita að nálægum tækjum hvenær sem er, jafnvel þegar slökkt er á Bluetooth. Sem dæmi er hægt að nota þetta til að bæta eiginleika og þjónustu sem byggja á staðsetningu."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"Kerfi"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"Kerfisuppfærslur"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Android útgáfa"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"Skráning <xliff:g id="DEVICE_NAME">%1$s</xliff:g> mistókst"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"Ef þú bætir við traustu tæki verðurðu að stilla auðkenningarmáta. Ef þú ert ekki með traust tæki við höndina verður auðkenningar krafist til að fá aðgang að prófílnum þínum."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"Tæki aftengt."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"Hreinsa skilríki"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"Fjarlægja öll vottorð"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"Fjarlægja allt innihald?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"Hreinsað úr skilríkjageymslu."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"Ekki tókst að eyða skilríkjageymslu."</string>
     <string name="forget" msgid="3971143908183848527">"Gleyma"</string>
     <string name="connect" msgid="5861699594602380150">"Tengja"</string>
     <string name="disconnect" msgid="6140789953324820336">"Aftengja"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Þetta eyðir kynningarreikningnum og núllstillir kerfið. Öll notandagögn glatast."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Hætta í kynningarútgáfu"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"HUNSA"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"Þessi eiginleiki er ekki í boði á meðan þú ekur."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"Ekki er hægt að bæta við notanda meðan á akstri stendur."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"Þessi eiginleiki er ekki í boði meðan á akstri stendur"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"Ekki er hægt að bæta við notanda meðan á akstri stendur"</string>
 </resources>
diff --git a/res/values-it/config.xml b/res/values-it/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-it/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 2c2cfd1..7851aa1 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -19,7 +19,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="settings_label" msgid="5147911978211079839">"Impostazioni"</string>
     <string name="more_settings_label" msgid="3867559443480110616">"Altro"</string>
-    <string name="display_settings" msgid="5325515247739279185">"Visualizzazione"</string>
+    <string name="display_settings" msgid="5325515247739279185">"Display"</string>
     <string name="brightness" msgid="2919605130898772866">"Livello di luminosità"</string>
     <string name="auto_brightness_title" msgid="9124647862844666581">"Luminosità adattiva"</string>
     <string name="auto_brightness_summary" msgid="4741887033140384352">"Ottimizza il livello di luminosità in base alla luce disponibile"</string>
@@ -209,7 +209,7 @@
     <string name="tts_reset" msgid="6289481549801844709">"Reimposta"</string>
     <string name="sound_settings" msgid="3072423952331872246">"Audio"</string>
     <string name="ring_volume_title" msgid="3135241004980719442">"Volume suoneria"</string>
-    <string name="navi_volume_title" msgid="946292066759195165">"Volume per la navigazione"</string>
+    <string name="navi_volume_title" msgid="946292066759195165">"Volume navigazione"</string>
     <string name="incoming_call_volume_title" msgid="6972117872424656876">"Suoneria"</string>
     <string name="notification_volume_title" msgid="6749411263197157876">"Notifica"</string>
     <string name="media_volume_title" msgid="6697416686272606865">"Contenuti multimediali"</string>
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"Non installata per l\'utente"</string>
     <string name="permissions_label" msgid="2701446753515612685">"Autorizzazioni"</string>
     <string name="notifications_label" msgid="6586089149665170731">"Notifiche"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"Spazio di archiviazione e cache"</string>
     <string name="application_version_label" msgid="8556889839783311649">"Versione: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"Nessuna autorizzazione concessa"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"Nessuna autorizzazione richiesta"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s in memoria interna"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"Utilizzo dei dati"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"Utilizzo dati dell\'app"</string>
     <string name="computing_size" msgid="5791407621793083965">"Elaborazione…"</string>
@@ -340,16 +342,11 @@
     <string name="wifi_control_title" msgid="5660436566907731929">"Controllo del Wi-Fi"</string>
     <string name="wifi_control_description" msgid="6021926850423169261">"Controllo del Wi-Fi consente a un\'app di attivare o disattivare il Wi-Fi, cercare e connettersi a reti Wi-Fi, aggiungere e rimuovere reti oppure avviare un hotspot solo locale."</string>
     <string name="more_special_access_title" msgid="166115485446645971">"Altro"</string>
-    <string name="location_settings_title" msgid="901334356682423679">"Luogo"</string>
+    <string name="location_settings_title" msgid="901334356682423679">"Posizione"</string>
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"Richieste di posizione recenti"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"Nessuna richiesta di posizione recente"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"Autorizzazioni a livello di app"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"Ricerca"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"Servizi di geolocalizzazione"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Ricerca di reti Wi-Fi"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Consenti ad app e servizi di cercare reti Wi-Fi in qualsiasi momento, anche quando il Wi-Fi non è attivo. Questa funzione è utile, ad esempio, per migliorare funzioni e servizi basati sulla posizione."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"Scansione di dispositivi Bluetooth"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"Consenti ad app e servizi di cercare dispositivi nelle vicinanze in qualsiasi momento, anche quando il Bluetooth non è attivo. Questa funzione è utile, ad esempio, per migliorare funzioni e servizi basati sulla posizione."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"Sistema"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"Aggiornamenti di sistema"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Versione Android"</string>
@@ -438,7 +435,7 @@
     <string name="date_picker_title" msgid="1533614225273770178">"Data"</string>
     <string name="time_picker_title" msgid="7436045944320504639">"Ora"</string>
     <string name="user_admin" msgid="1535484812908584809">"Amministratore"</string>
-    <string name="signed_in_admin_user" msgid="1267225622818673274">"Accesso eseguito da amministratore"</string>
+    <string name="signed_in_admin_user" msgid="1267225622818673274">"Accesso come amministratore"</string>
     <string name="grant_admin_permissions_title" msgid="4628430467359951437">"Tutte le autorizzazioni di amministratore"</string>
     <string name="grant_admin_permissions_button_text" msgid="988239414372882401">"Imposta come amministratore"</string>
     <string name="grant_admin_permissions_message" msgid="1751910369004774830">"L\'utente potrà eliminare utenti, includere altri amministratori e ripristinare le impostazioni di fabbrica del sistema."</string>
@@ -451,7 +448,7 @@
     <string name="uninstall_apps_permission_title" msgid="8448422340567430659">"Disinstallazione di app"</string>
     <string name="user_add_user_menu" msgid="5319151436895941496">"Aggiungi utente"</string>
     <string name="user_new_user_name" msgid="7115771396412339662">"Nuovo utente"</string>
-    <string name="user_add_user_title" msgid="7458813670614932479">"Aggiungere nuovo utente?"</string>
+    <string name="user_add_user_title" msgid="7458813670614932479">"Aggiungere un nuovo utente?"</string>
     <string name="user_add_user_message_setup" msgid="6030901156040053106">"Il nuovo utente, una volta aggiunto, dovrà configurare il suo spazio."</string>
     <string name="user_add_user_message_update" msgid="1528170913388932459">"Qualsiasi utente può aggiornare le app per tutti gli altri."</string>
     <string name="user_limit_reached_title" msgid="8803355734556061238">"Limite utenti raggiunto"</string>
@@ -503,7 +500,7 @@
     <string name="user_add_account_menu" msgid="6625351983590713721">"Aggiungi account"</string>
     <string name="no_accounts_added" msgid="5148163140691096055">"Nessun account aggiunto"</string>
     <string name="account_list_title" msgid="7631588514613843065">"Account per <xliff:g id="CURRENT_USER_NAME">%1$s</xliff:g>"</string>
-    <string name="account_auto_sync_title" msgid="3238816995364191432">"Sincronizza i dati automaticamente"</string>
+    <string name="account_auto_sync_title" msgid="3238816995364191432">"Sincronizza dati automaticamente"</string>
     <string name="account_auto_sync_summary" msgid="6963837893148304128">"Consenti aggiornamento automatico dei dati delle app"</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="6027487764261344033">"Attivare sincron. automatica?"</string>
     <string name="data_usage_auto_sync_on_dialog" msgid="2770233931307606956">"Tutte le modifiche che apporti ai tuoi account sul Web verranno automaticamente copiate sul dispositivo.\n\nAlcuni account potrebbero inoltre copiare automaticamente sul Web tutte le modifiche che apporti sul telefono. Gli Account Google funzionano in questo modo."</string>
@@ -620,9 +617,9 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="38813552228809240">"Non sono consentite sequenze di cifre in ordine crescente o decrescente oppure ripetute."</string>
     <string name="setup_lock_settings_options_button_label" msgid="3337845811029780896">"Opzioni di blocco schermo"</string>
     <string name="build_info_fmt" msgid="5592554123908086426">"<xliff:g id="FINGERPRINT">%1$s</xliff:g>\n<xliff:g id="DATE">%2$s</xliff:g>: <xliff:g id="NUM_DAYS">%3$s</xliff:g> giorni fa"</string>
-    <string name="add_device_title" msgid="8452168024017866232">"Aggiungi dispos. attendibile"</string>
+    <string name="add_device_title" msgid="8452168024017866232">"Aggiungi dispositivo attendibile"</string>
     <string name="add_device_summary" msgid="5368217520710573302">"Bluetooth attivato per consentire disp. attend."</string>
-    <string name="trusted_device" msgid="5637378361866787603">"Dispos. attendibili"</string>
+    <string name="trusted_device" msgid="5637378361866787603">"Dispositivi attendibili"</string>
     <plurals name="trusted_device_subtitle" formatted="false" msgid="462041049834264945">
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> dispositivi</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> dispositivo</item>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"Registrazione del dispositivo <xliff:g id="DEVICE_NAME">%1$s</xliff:g> non riuscita"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"L\'aggiunta di un dispositivo attendibile comporta necessariamente la successiva impostazione di un metodo di autenticazione. Se non hai con te il dispositivo attendibile, l\'autenticazione dovrà necessariamente accedere al tuo profilo."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"Dispositivo disconnesso."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"Cancella credenziali"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"Rimuovi tutti i certificati"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"Rimuovere tutti i contenuti?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"Archivio credenziali cancellato."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"Impossibile cancellare l\'archivio credenziali."</string>
     <string name="forget" msgid="3971143908183848527">"Elimina"</string>
     <string name="connect" msgid="5861699594602380150">"Collega"</string>
     <string name="disconnect" msgid="6140789953324820336">"Scollega"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"L\'account dimostrativo verrà eliminato e verranno ripristinati i dati di fabbrica del sistema. Tutti i dati utente andranno persi."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Chiudi demo"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"IGNORA"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"Funzione non disponibile durante la guida."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"Impossibile aggiungere l\'utente durante la guida."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"Funzionalità non disponibile durante la guida"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"Impossibile aggiungere l\'utente durante la guida"</string>
 </resources>
diff --git a/res/values-iw/config.xml b/res/values-iw/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-iw/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 8ecc147..b6a1685 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -287,9 +287,11 @@
     <string name="not_installed" msgid="4218816013370552746">"לא מותקנת אצל המשתמש הזה"</string>
     <string name="permissions_label" msgid="2701446753515612685">"הרשאות"</string>
     <string name="notifications_label" msgid="6586089149665170731">"התראות"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"אחסון ומטמון"</string>
     <string name="application_version_label" msgid="8556889839783311649">"גרסה: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"לא הוענקו הרשאות"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"לא התבקשו הרשאות"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s בשטח אחסון פנימי"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"שימוש בחבילת הגלישה"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"שימוש בחבילת הגלישה באפל\'"</string>
     <string name="computing_size" msgid="5791407621793083965">"מתבצע חישוב…"</string>
@@ -350,12 +352,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"בקשות של מיקומים אחרונים"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"אין בקשות של מיקומים אחרונים"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"הרשאות ברמת אפליקציה"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"סריקה"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"שירותי מיקום"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"סריקת Wi-Fi"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"אפליקציות ושירותים יוכלו לסרוק רשתות Wi‑Fi בכל עת, גם כאשר ה-Wi‑Fi כבוי. ניתן להשתמש בכך, למשל, כדי לשפר תכונות ושירותים מבוססי מיקום."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"סריקת Bluetooth"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"אפליקציות ושירותים יוכלו לסרוק מכשירים בקרבת מקום בכל עת, גם כאשר ה-Bluetooth כבוי. ניתן להשתמש בכך, למשל, כדי לשפר תכונות ושירותים מבוססי מיקום."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"מערכת"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"עדכוני מערכת"</string>
     <string name="firmware_version" msgid="8491753744549309333">"גרסת Android"</string>
@@ -528,7 +525,7 @@
     <string name="really_remove_account_message" msgid="4296769280849579900">"הסרת חשבון זה תגרום למחיקת כל ההודעות, אנשי הקשר ונתונים נוספים מהמכשיר!"</string>
     <string name="remove_account_error_title" msgid="8368044943174826635">"לא ניתן היה להסיר את החשבון."</string>
     <string name="account_sync_title" msgid="6541844336300236915">"סנכרון חשבון"</string>
-    <string name="account_sync_summary_some_on" msgid="4525960296068027182">"הסנכרון פועל ל-<xliff:g id="ID_1">%1$d</xliff:g> מתוך <xliff:g id="ID_2">%2$d</xliff:g> פריטים"</string>
+    <string name="account_sync_summary_some_on" msgid="4525960296068027182">"הסנכרון פועל עבור <xliff:g id="ID_1">%1$d</xliff:g> מתוך <xliff:g id="ID_2">%2$d</xliff:g> פריטים"</string>
     <string name="account_sync_summary_all_on" msgid="3652264471870312725">"הסנכרון פועל לכל הפריטים"</string>
     <string name="account_sync_summary_all_off" msgid="6550959714035312414">"הסנכרון כבוי לכל הפריטים"</string>
     <string name="sync_disabled" msgid="393531064334628258">"הסנכרון כבוי"</string>
@@ -664,6 +661,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"ההרשמה של <xliff:g id="DEVICE_NAME">%1$s</xliff:g> נכשלה"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"כדי להוסיף מכשיר מהימן, צריך להגדיר שיטת אימות בשלב הבא. אם המכשיר המהימן לא נמצא ברשותך, יידרש אימות כדי לקבל גישה לפרופיל שלך."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"המכשיר נותק."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"ניקוי פרטי כניסה"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"הסרת כל האישורים"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"להסיר את כל התכנים?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"אחסון פרטי הכניסה נמחק."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"לא ניתן היה למחוק את אחסון פרטי הכניסה."</string>
     <string name="forget" msgid="3971143908183848527">"מחיקה"</string>
     <string name="connect" msgid="5861699594602380150">"חיבור"</string>
     <string name="disconnect" msgid="6140789953324820336">"ניתוק"</string>
@@ -679,6 +681,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"פעולה זו תמחק את חשבון ההדגמה ותבצע למערכת איפוס לנתוני היצרן. כל נתוני המשתמש יאבדו."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"יציאה ממצב הדגמה"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"סגירה"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"התכונה לא זמינה במהלך הנהיגה."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"לא ניתן להוסיף משתמש בזמן הנהיגה."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"התכונה לא זמינה בזמן הנהיגה"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"לא ניתן להוסיף משתמש בזמן הנהיגה"</string>
 </resources>
diff --git a/res/values-ja/config.xml b/res/values-ja/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-ja/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 32c434f..f25ad39 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -51,7 +51,7 @@
     <string name="roaming_summary" msgid="7476127740259728901">"ローミング中にデータサービスに接続する"</string>
     <string name="roaming_alert_title" msgid="4433901635766775763">"データ ローミングを許可しますか?"</string>
     <string name="roaming_warning" msgid="5313281900566657209">"高額な通信料が発生することがあります。"</string>
-    <string name="data_usage_settings" msgid="7877132994777987848">"データ使用"</string>
+    <string name="data_usage_settings" msgid="7877132994777987848">"データ使用量"</string>
     <string name="data_usage_title" msgid="2923515974389203812">"メインデータ"</string>
     <string name="data_used_formatted" msgid="6684557577780068339">"<xliff:g id="ID_1">^1</xliff:g> <xliff:g id="ID_2">^2</xliff:g> 使用"</string>
     <string name="cell_data_warning" msgid="8997739664336571149">"データ警告: <xliff:g id="ID_1">^1</xliff:g>"</string>
@@ -142,8 +142,8 @@
     <string name="wifi_hotspot_security_title" msgid="2299925790743587725">"セキュリティ"</string>
     <string name="wifi_hotspot_wpa2_personal" msgid="7135181212837798318">"WPA2-Personal"</string>
     <string name="wifi_hotspot_security_none" msgid="2514844105085054386">"なし"</string>
-    <string name="wifi_hotspot_ap_band_title" msgid="7685279281668988593">"AP 帯域幅"</string>
-    <string name="wifi_ap_band_config" msgid="6143905484067008736">"AP 帯域幅の選択"</string>
+    <string name="wifi_hotspot_ap_band_title" msgid="7685279281668988593">"AP 周波数帯"</string>
+    <string name="wifi_ap_band_config" msgid="6143905484067008736">"AP 周波数帯の選択"</string>
     <string name="wifi_ap_choose_auto" msgid="3779526909841604566">"自動"</string>
     <string name="wifi_ap_choose_2G" msgid="6356913773766753502">"2.4 GHz 帯"</string>
     <string name="wifi_ap_choose_5G" msgid="8561440488455528673">"5.0 GHz 帯"</string>
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"このユーザーに対してインストールされていません"</string>
     <string name="permissions_label" msgid="2701446753515612685">"権限"</string>
     <string name="notifications_label" msgid="6586089149665170731">"通知"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"ストレージとキャッシュ"</string>
     <string name="application_version_label" msgid="8556889839783311649">"バージョン: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"権限が付与されていません"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"リクエストされた権限はありません"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s(内部ストレージ)"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"データ使用量"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"アプリのデータ使用量"</string>
     <string name="computing_size" msgid="5791407621793083965">"計算しています…"</string>
@@ -323,8 +325,8 @@
     <string name="app_link_open_never" msgid="2173174327831792316">"このアプリで開かない"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="7345116365785981158">"対応リンク"</string>
     <string name="special_access" msgid="5730278220917123811">"特別なアプリアクセス"</string>
-    <string name="show_system" msgid="4401355756969485287">"システムを表示"</string>
-    <string name="hide_system" msgid="8845453295584638040">"システムを表示しない"</string>
+    <string name="show_system" msgid="4401355756969485287">"システムアプリを表示"</string>
+    <string name="hide_system" msgid="8845453295584638040">"システムアプリを表示しない"</string>
     <string name="modify_system_settings_title" msgid="4596320571562433972">"システム設定の変更"</string>
     <string name="modify_system_settings_description" msgid="5295023124419592452">"この権限により、アプリはシステム設定を変更できるようになります。"</string>
     <string name="notification_access_title" msgid="1467340098885813473">"通知へのアクセス"</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"最近の位置情報リクエスト"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"最近の位置情報リクエストはありません"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"アプリレベルの権限"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"スキャン"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"位置情報サービス"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Wi‑Fi のスキャン"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"アプリやサービスに対し、Wi‑Fi が OFF の場合でも、常に Wi-Fi ネットワークをスキャンすることを許可します。たとえば、位置情報を使用する機能やサービスの改善に役立ちます。"</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"Bluetooth のスキャン"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"アプリやサービスに対し、Bluetooth が OFF の場合でも、常に付近のデバイスをスキャンすることを許可します。たとえば、位置情報を使用する機能やサービスの改善に役立ちます。"</string>
     <string name="system_setting_title" msgid="6864599341809463440">"システム"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"システム アップデート"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Android のバージョン"</string>
@@ -367,7 +364,7 @@
     <string name="about_settings" msgid="4329457966672592345">"Android Auto について"</string>
     <string name="about_summary" msgid="5374623866267691206">"Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="about_settings_summary" msgid="7975072809083281401">"規約、ステータス、ソフトウェア バージョンを表示"</string>
-    <string name="legal_information" msgid="1838443759229784762">"規約"</string>
+    <string name="legal_information" msgid="1838443759229784762">"法的情報"</string>
     <string name="contributors_title" msgid="7698463793409916113">"アライアンス パートナー"</string>
     <string name="manual" msgid="4819839169843240804">"マニュアル"</string>
     <string name="regulatory_labels" msgid="3165587388499646779">"規制ラベル"</string>
@@ -438,7 +435,7 @@
     <string name="date_picker_title" msgid="1533614225273770178">"日付"</string>
     <string name="time_picker_title" msgid="7436045944320504639">"時刻"</string>
     <string name="user_admin" msgid="1535484812908584809">"管理者"</string>
-    <string name="signed_in_admin_user" msgid="1267225622818673274">"管理者としてログインしました"</string>
+    <string name="signed_in_admin_user" msgid="1267225622818673274">"管理者としてログイン済み"</string>
     <string name="grant_admin_permissions_title" msgid="4628430467359951437">"すべての管理者権限"</string>
     <string name="grant_admin_permissions_button_text" msgid="988239414372882401">"管理者にする"</string>
     <string name="grant_admin_permissions_message" msgid="1751910369004774830">"このユーザーは、他の管理者を含むユーザーの削除、システムデータの初期化を行えるようになります。"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> の登録に失敗しました"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"信頼できるデバイスを追加するには、次に認証方式を設定してください。信頼できるデバイスがない場合は、プロフィールにアクセスする際に認証が必要になります。"</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"デバイスの接続が解除されました。"</string>
+    <string name="credentials_reset" msgid="873900550885788639">"認証情報の消去"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"証明書をすべて削除する"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"コンテンツをすべて削除しますか?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"認証情報ストレージを消去しました。"</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"認証情報ストレージを消去できませんでした。"</string>
     <string name="forget" msgid="3971143908183848527">"削除"</string>
     <string name="connect" msgid="5861699594602380150">"接続"</string>
     <string name="disconnect" msgid="6140789953324820336">"接続を解除"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"デモアカウントが削除され、システムが出荷時の設定にリセットされます。すべてのユーザーデータは失われます。"</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"デモを終了"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"閉じる"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"この機能は運転中は利用できません。"</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"運転中はユーザーを追加できません。"</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"この機能は運転中は利用できません"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"運転中はユーザーを追加できません"</string>
 </resources>
diff --git a/res/values-ka/config.xml b/res/values-ka/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-ka/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index b958973..051dff0 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"ამ მომხმარებლისთვის დაყენებული არ არის"</string>
     <string name="permissions_label" msgid="2701446753515612685">"ნებართვები"</string>
     <string name="notifications_label" msgid="6586089149665170731">"შეტყობინებები"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"მეხსიერება და ქეში"</string>
     <string name="application_version_label" msgid="8556889839783311649">"ვერსია: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"ნებართვები არ არის გაცემული"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"ნებართვებზე მოთხოვნები არ არის"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s შიდა მეხსიერებაში"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"მონაცემთა მოხმარება"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"აპის მონაცემთა გამოყენება"</string>
     <string name="computing_size" msgid="5791407621793083965">"გამოთვლა…"</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"მდებარეობის ბოლოდროინდელი მოთხოვნები"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"მდებარეობის ბოლოდროინდელი მოთხოვნები არ არის"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"ნებართვები აპის დონეზე"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"სკანირება"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"მდებარეობის სერვისები"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Wi-Fi სკანირება"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"აპებისა და სერვისებისთვის Wi‑Fi ქსელების ნებისმიერ დროს სკანირების დაშვება, მაშინაც კი, როცა Wi‑Fi გამორთულია. მაგალითად, აღნიშნული გამოიყენება მდებარეობაზე დაფუძნებული ფუნქციებისა და სერვისების გასაუმჯობესებლად."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"Bluetooth სკანირება"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"აპებისა და სერვისებისთვის ახლომდებარე მოწყობილობების ნებისმიერ დროს სკანირების დაშვება, მაშინაც კი, როცა Bluetooth გამორთულია. მაგალითად, აღნიშნული გამოიყენება მდებარეობაზე დაფუძნებული ფუნქციებისა და სერვისების გასაუმჯობესებლად."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"სისტემა"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"სისტემის განახლებები"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Android-ის ვერსია"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>-ის რეგისტრაცია ვერ მოხერხდა"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"სანდო მოწყობილობის დასამატებლად მომდევნო ეტაპზე საჭირო იქნება ავტორიზაციის მეთოდის დაყენება. ავტორიზაცია საჭირო იქნება თქვენს პროფილზე წვდომისთვის, როცა სანდო მოწყობილობა თან არ გექნებათ."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"მოწყობილობის კავშირი გათიშულია."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"ავტორიზაციის მონაცემების გასუფთავება"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"ყველა სერტიფიკატის ამოშლა"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"გსურთ სრული კონტენტის წაშლა?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"ავტორიზაციის მონაცემთა საცავი წაშლილია."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"ავტორიზაციის მონაცემების საცავის წაშლა შეუძლებელია."</string>
     <string name="forget" msgid="3971143908183848527">"დავიწყება"</string>
     <string name="connect" msgid="5861699594602380150">"დაკავშირება"</string>
     <string name="disconnect" msgid="6140789953324820336">"კავშირის გაწყვეტა"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"ეს ქმედება წაშლის დემო-ანგარიშს და სისტემის ქარხნულ მონაცემებს აღადგენს. სამომხმარებლო მონაცემები მთლიანად წაიშლება."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"დემოს დატოვება"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"დახურვა"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"ფუნქცია მიუწვდომელია მანქანის მართვისას."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"მანქანის მართვისას მომხმარებლის დამატება ვერ მოხერხდება."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"ფუნქცია მიუწვდომელია მანქანის მართვისას"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"მანქანის მართვისას მომხმარებლის დამატება ვერ მოხერხდება"</string>
 </resources>
diff --git a/res/values-kk/config.xml b/res/values-kk/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-kk/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 8df952b..a1e3fa9 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"Бұл пайдаланушы үшін орнатылмаған"</string>
     <string name="permissions_label" msgid="2701446753515612685">"Рұқсаттар"</string>
     <string name="notifications_label" msgid="6586089149665170731">"Хабарландырулар"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"Жад және кэш"</string>
     <string name="application_version_label" msgid="8556889839783311649">"Нұсқа: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"Ешқандай рұқсат берілмеген"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"Ешқандай рұқсат сұралмаған"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"Ішкі жад: %s"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"Деректер трафигі"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"Қолданбаның дерек шығыны"</string>
     <string name="computing_size" msgid="5791407621793083965">"Есептелуде…"</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"Жақында жасалған орналасқан жерді анықтау сұраулары"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"Орналасқан жерді анықтау сұраулары жақында жасалмаған"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"Қолданба деңгейіндегі рұқсаттар"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"Іздеу"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"Орынды анықтау қызметтері"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Wi-Fi іздеу"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Қолданбаларға және қызметтерге, Wi-Fi өшірулі кезде де, Wi-Fi желілерін кез келген уақытта іздеуге рұқсат ету. Бұл параметрді, мысалы, орналасуды анықтау функциялары мен қызметтерін жақсарту үшін пайдалануға болады."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"Bluetooth іздеу"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"Bluetooth өшірулі болса да, қолданбалар мен қызметтерге маңайдағы құрылғыларды іздеуге рұқсат беру. Бұл параметрді, мысалы, геодеректер негізіндегі функциялар мен қызметтерді жақсарту үшін пайдалануға болады."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"Жүйе"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"Жүйенің жаңа нұсқалары"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Android нұсқасы"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> тіркелмеді."</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"Сенімді құрылғыны енгізу үшін аутентификация әдісін орнату қажет. Сенімді құрылғыңыз болмаса, профильге кіру үшін аутентификация керек."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"Құрылғы ажыратылды."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"Тіркелу деректерін өшіру"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"Барлық сертификаттарды өшіру"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"Мазмұн толығымен өшірілсін бе?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"Маңызды деректер жады тазартылды."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"Маңызды деректер жады тазартылмады."</string>
     <string name="forget" msgid="3971143908183848527">"Ұмыту"</string>
     <string name="connect" msgid="5861699594602380150">"Жалғау"</string>
     <string name="disconnect" msgid="6140789953324820336">"Ажырату"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Демо есептік жазбаңыз жойылады және жүйенің зауыттық деректері қалпына келтіріледі. Пайдаланушының барлық деректері жоғалады."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Деморежимнен шығу"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"ЖАБУ"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"Көлік жүргізу кезінде бұл функция жұмыс істемейді."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"Көлік жүргізу кезінде пайдаланушыны енгізу мүмкін емес."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"Көлік жүргізу кезінде бұл функция жұмыс істемейді."</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"Көлік жүргізу кезінде пайдаланушыны енгізу мүмкін емес."</string>
 </resources>
diff --git a/res/values-km/config.xml b/res/values-km/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-km/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index c079180..ba4e9e3 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"មិន​បាន​ដំឡើង​សម្រាប់​អ្នក​ប្រើប្រាស់​នេះទេ"</string>
     <string name="permissions_label" msgid="2701446753515612685">"ការអនុញ្ញាត"</string>
     <string name="notifications_label" msgid="6586089149665170731">"ការជូនដំណឹង"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"ទំហំផ្ទុក និង​ឃ្លាំងផ្ទុកទិន្នន័យ"</string>
     <string name="application_version_label" msgid="8556889839783311649">"កំណែ៖ %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"មិន​បាន​ផ្តល់សិទ្ធិអនុញ្ញាតទេ"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"មិន​បាន​ស្នើសុំសិទ្ធិអនុញ្ញាតទេ"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s នៅក្នុង​ទំហំ​ផ្ទុក​ខាង​ក្នុង"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"ការ​ប្រើ​ទិន្នន័យ"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"ការប្រើទិន្នន័យកម្មវិធី"</string>
     <string name="computing_size" msgid="5791407621793083965">"កំពុង​គណនា…"</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"សំណើ​ទីតាំង​ថ្មីៗ"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"គ្មាន​សំណើ​ទីតាំង​ថ្មីៗ​ទេ"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"ការ​អនុញ្ញាត​កម្រិត​កម្មវិធី"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"ការស្កេន"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"សេវាកម្ម​ទីតាំង"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"ការស្កេន Wi‑Fi"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"អនុញ្ញាត​ឱ្យ​កម្មវិធី និង​សេវាកម្ម​ស្កេនរក​បណ្ដាញ Wi‑Fi បាន​គ្រប់ពេល ទោះបីជា Wi‑Fi ​បិទក៏ដោយ។ ឧទាហរណ៍ សកម្មភាព​នេះ​អាច​ត្រូវ​បាន​ប្រើ ដើម្បី​កែលម្អ​មុខងារ និង​សេវាកម្មនានា​ដែល​ផ្អែក​លើ​ទីតាំង។"</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"ការស្កេនប៊្លូធូស"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"អនុញ្ញាត​ឱ្យ​កម្មវិធី និងសេវាកម្ម​ស្កេនរក​ឧបករណ៍ដែល​នៅ​ជិត​បាន​គ្រប់ពេល ទោះបីជា​ប៊្លូធូសបិទ​ក៏ដោយ។ ឧទាហរណ៍ សកម្មភាព​នេះ​អាច​ត្រូវ​បាន​ប្រើ ដើម្បី​កែលម្អ​មុខងារ និងសេវាកម្មនានា​ដែល​ផ្អែក​លើ​ទីតាំង។"</string>
     <string name="system_setting_title" msgid="6864599341809463440">"ប្រព័ន្ធ"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"បច្ចុប្បន្នភាព​ប្រព័ន្ធ"</string>
     <string name="firmware_version" msgid="8491753744549309333">"កំណែ Android"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"មិន​អាច​ចុះឈ្មោះ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> បាន​ទេ​"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"ការបញ្ចូល​ឧបករណ៍​ដែល​ទុកចិត្ត​តម្រូវឱ្យអ្នក​កំណត់​វិធីផ្ទៀងផ្ទាត់​បន្ទាប់។ ប្រសិនបើអ្នក​គ្មាន​ឧបករណ៍​ដែលទុកចិត្ត​ជាប់ខ្លួនអ្នក​ទេ នោះនឹង​តម្រូវឱ្យ​មានការផ្ទៀងផ្ទាត់ ដើម្បី​ចូលប្រើ​កម្រងព័ត៌មាន​របស់អ្នក។"</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"បានផ្តាច់​ឧបករណ៍។"</string>
+    <string name="credentials_reset" msgid="873900550885788639">"សម្អាត​ព័ត៌មានផ្ទៀងផ្ទាត់"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"លុប​វិញ្ញាបនបត្រ​ទាំងអស់"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"លុបខ្លឹមសារចេញ​ទាំងអស់?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"កន្លែង​ផ្ទុក​ព័ត៌មាន​សម្ងាត់ត្រូវបានលុប។"</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"មិនអាចលុប​កន្លែងផ្ទុកព័ត៌មាន​សម្ងាត់បានទេ។"</string>
     <string name="forget" msgid="3971143908183848527">"បំភ្លេច"</string>
     <string name="connect" msgid="5861699594602380150">"ភ្ជាប់"</string>
     <string name="disconnect" msgid="6140789953324820336">"ផ្ដាច់"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"ការចាកចេញ​នេះ​នឹង​លុប​គណនីបង្ហាញ​សាកល្បង និងកំណត់​ទិន្នន័យប្រព័ន្ធ​ដូច​ចេញ​ពី​រោងចក្រ។​ ទិន្នន័យ​អ្នក​ប្រើប្រាស់​ទាំងអស់​នឹង​បាត់បង់។"</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"ចាក​ចេញ​ពីការបង្ហាញ​សាកល្បង"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"ច្រានចោល"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"មិនអាច​ប្រើមុខងារ​នេះបានទេ ខណៈពេល​កំពុង​បើកបរ។"</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"មិនអាច​បញ្ចូល​អ្នកប្រើប្រាស់​ខណៈពេល​បើកបរ​បានទេ។"</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"មិនអាច​ប្រើមុខងារ​នេះបានទេ ខណៈពេល​កំពុង​បើកបរ"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"មិនអាច​បញ្ចូល​អ្នកប្រើប្រាស់​បានទេ ខណៈពេល​កំពុងបើកបរ"</string>
 </resources>
diff --git a/res/values-kn/config.xml b/res/values-kn/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-kn/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 5711879..4883169 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"ಈ ಬಳಕೆದಾರರಿಗಾಗಿ ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡಲಾಗಿಲ್ಲ"</string>
     <string name="permissions_label" msgid="2701446753515612685">"ಅನುಮತಿಗಳು"</string>
     <string name="notifications_label" msgid="6586089149665170731">"ಅಧಿಸೂಚನೆಗಳು"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"ಸಂಗ್ರಹಣೆ ಮತ್ತು ಕ್ಯಾಷ್"</string>
     <string name="application_version_label" msgid="8556889839783311649">"ಆವೃತ್ತಿ: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"ಯಾವುದೇ ಅನುಮತಿಗಳನ್ನು ನೀಡಲಾಗಿಲ್ಲ"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"ಯಾವುದೇ ಅನುಮತಿಗಳನ್ನು ವಿನಂತಿಸಿಲ್ಲ"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"ಆಂತರಿಕ ಸಂಗ್ರಹಣೆಯಲ್ಲಿ %s"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"ಡೇಟಾ ಬಳಕೆ"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"ಅಪ್ಲಿಕೇಶನ್‌ ಡೇಟಾ ಬಳಕೆ"</string>
     <string name="computing_size" msgid="5791407621793083965">"ಗಣನೆ ಮಾಡಲಾಗುತ್ತಿದೆ…"</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"ಇತ್ತೀಚಿನ ಸ್ಥಳ ವಿನಂತಿಗಳು"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"ಯಾವುದೇ ಇತ್ತೀಚಿನ ಸ್ಥಳ ವಿನಂತಿಗಳು ಇಲ್ಲ"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"ಆ್ಯಪ್‌ ಹಂತದ ಅನುಮತಿಗಳು"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"ಸ್ಕ್ಯಾನ್ ಮಾಡುವಿಕೆ"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"ಸ್ಥಳ ಸೇವೆಗಳು"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"ವೈ-ಫೈ ಸ್ಕ್ಯಾನಿಂಗ್"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"ವೈ-ಫೈ ಆಫ್‌ ಆಗಿದ್ದರೂ ಸಹ, ಯಾವ ಸಮುಯದಲ್ಲಾದರೂ ವೈ-ಫೈಗೆ ಸ್ಕ್ಯಾನ್‌ ಮಾಡಲು ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಮತ್ತು ಸೇವೆಗಳನ್ನು ಅನುಮತಿಸಿ. ಉದಾಹರಣೆಗೆ, ಸ್ಥಳ ಆಧಾರಿತ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಮತ್ತು ಸೇವೆಗಳನ್ನು ಸುಧಾರಿಸಲು ಇದನ್ನು ಬಳಸಬಹುದಾಗಿದೆ."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"ಬ್ಲೂಟೂತ್ ಸ್ಕ್ಯಾನಿಂಗ್"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"ಬ್ಲೂಟೂತ್‌ ಆಫ್‌ ಆಗಿದ್ದರೂ ಸಹ, ಯಾವ ಸಮಯದಲ್ಲಾದರೂ ಸಮೀಪದ ಸಾಧನಗಳಿಗೆ ಸ್ಕ್ಯಾನ್‌ ಮಾಡಲು ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಮತ್ತು ಸೇವೆಗಳನ್ನು ಅನುಮತಿಸಿ. ಉದಾಹರಣೆಗೆ, ಸ್ಥಳ ಆಧಾರಿತ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಮತ್ತು ಸೇವೆಗಳನ್ನು ಸುಧಾರಿಸಲು ಇದನ್ನು ಬಳಸಬಹುದಾಗಿದೆ."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"ಸಿಸ್ಟಂ"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"ಸಿಸ್ಟಂ ಅಪ್‌ಡೇಟ್‌ಗಳು"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Android ಆವೃತ್ತಿ"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ನೋಂದಣಿ ವಿಫಲವಾಗಿದೆ"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"ವಿಶ್ವಾಸಾರ್ಹ ಸಾಧನವನ್ನು ಸೇರಿಸುವುದು ನೀವು ಪ್ರಮಾಣೀಕರಣ ವಿಧಾನವನ್ನು ಹೊಂದಿಸುವ ಅಗತ್ಯವಿದೆ. ನೀವು ವಿಶ್ವಾಸಾರ್ಹ ಸಾಧನವನ್ನು ನಿಮ್ಮೊಂದಿಗೆ ಹೊಂದಿಲ್ಲದೇ ಇದ್ದರೆ, ನಿಮ್ಮ ಪ್ರೊಫೈಲ್ ಅನ್ನು ಪ್ರವೇಶಿಸಲು ಪ್ರಮಾಣೀಕರಣದ ಅಗತ್ಯವಿದೆ."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"ಸಾಧನದ ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸಲಾಗಿದೆ."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"ರುಜುವಾತುಗಳನ್ನು ತೆರವುಗೊಳಿಸಿ"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"ಎಲ್ಲಾ ಪ್ರಮಾಣಪತ್ರಗಳನ್ನು ತೆಗೆದುಹಾಕಿ"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"ಎಲ್ಲಾ ವಿಷಯಗಳನ್ನು ತೆಗೆದುಹಾಕುವುದೇ?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"ರುಜುವಾತು ಸಂಗ್ರಹಣೆಯನ್ನು ಅಳಿಸಲಾಗಿದೆ."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"ರುಜುವಾತು ಸಂಗ್ರಹಣೆಯನ್ನು ಅಳಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ."</string>
     <string name="forget" msgid="3971143908183848527">"ಮರೆಯಿರಿ"</string>
     <string name="connect" msgid="5861699594602380150">"ಸಂಪರ್ಕಿಸಿ"</string>
     <string name="disconnect" msgid="6140789953324820336">"ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸಿ"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"ಇದು ಡೆಮೊ ಖಾತೆಯನ್ನು ಅಳಿಸುತ್ತದೆ ಮತ್ತು ಫ್ಯಾಕ್ಟರಿ ಡೇಟಾ ಸಿಸ್ಟಂ ಅನ್ನು ಮರುಹೊಂದಿಸುತ್ತದೆ. ಎಲ್ಲಾ ಬಳಕೆದಾರ ಡೇಟಾವನ್ನು ಕಳೆದುಕೊಳ್ಳುತ್ತೀರಿ."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"ಡೆಮೊದಿಂದ ನಿರ್ಗಮಿಸಿ"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"ವಜಾಗೊಳಿಸಿ"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"ಡ್ರೈವ್ ಮಾಡುವಾಗ ಈ ವೈಶಿಷ್ಟ್ಯ ಲಭ್ಯವಿಲ್ಲ."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"ಚಾಲನೆ ಮಾಡುವಾಗ ಬಳಕೆದಾರರನ್ನು ಸೇರಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"ಡ್ರೈವ್ ಮಾಡುವಾಗ ಈ ವೈಶಿಷ್ಟ್ಯ ಲಭ್ಯವಿಲ್ಲ"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"ಡ್ರೈವ್ ಮಾಡುವಾಗ ಬಳಕೆದಾರರನ್ನು ಸೇರಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
 </resources>
diff --git a/res/values-ko/config.xml b/res/values-ko/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-ko/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 8f2f389..3657757 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"이 사용자에게 설치되지 않음"</string>
     <string name="permissions_label" msgid="2701446753515612685">"권한"</string>
     <string name="notifications_label" msgid="6586089149665170731">"알림"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"저장용량 및 캐시"</string>
     <string name="application_version_label" msgid="8556889839783311649">"버전: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"부여된 권한이 없습니다."</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"요청한 권한이 없습니다."</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"내부 저장소의 %s"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"데이터 사용량"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"앱 데이터 사용량"</string>
     <string name="computing_size" msgid="5791407621793083965">"계산 중..."</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"최근 위치 요청"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"최근 위치 요청 없음"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"앱 수준 권한"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"검색 중"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"위치 서비스"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Wi‑Fi 검색"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Wi‑Fi가 꺼져 있을 때도 항상 앱과 서비스에서 Wi-Fi 네트워크를 검색하도록 허용합니다. 이 설정은 예를 들면 위치 기반 기능 및 서비스를 개선하는 데 사용될 수 있습니다."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"블루투스 검색"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"블루투스가 꺼져 있을 때도 항상 앱과 서비스에서 주변 기기를 검색하도록 허용합니다. 이 설정은 예를 들면 위치 기반 기능 및 서비스를 개선하는 데 사용될 수 있습니다."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"시스템"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"시스템 업데이트"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Android 버전"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>을(를) 등록하는 데 실패했습니다."</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"신뢰할 수 있는 기기를 추가하면 다음번에 인증 수단을 설정해야 합니다. 신뢰할 수 있는 기기가 없으면 인증 과정을 거쳐야 내 프로필에 액세스할 수 있습니다."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"기기 연결이 끊어졌습니다."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"사용자 인증 정보 삭제"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"모든 인증서 삭제"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"콘텐츠를 모두 삭제하시겠습니까?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"사용자 인증 정보 저장소가 삭제되었습니다."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"사용자 인증 정보 저장소를 삭제하지 못했습니다."</string>
     <string name="forget" msgid="3971143908183848527">"삭제"</string>
     <string name="connect" msgid="5861699594602380150">"연결"</string>
     <string name="disconnect" msgid="6140789953324820336">"연결 해제"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"데모 계정을 삭제하고 시스템을 초기화합니다. 사용자 데이터는 모두 사라집니다."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"데모 종료"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"닫기"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"운전 중 기능 사용 불가"</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"운전 중에는 사용자를 추가할 수 없습니다."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"운전 중에 사용할 수 없는 기능입니다."</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"운전 중에는 사용자를 추가할 수 없습니다."</string>
 </resources>
diff --git a/res/values-ky/config.xml b/res/values-ky/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-ky/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 9504f54..ba9e321 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -63,10 +63,10 @@
     </plurals>
     <string name="billing_cycle_none_left" msgid="3499893148398931302">"Убакыт калган жок"</string>
     <string name="billing_cycle_less_than_one_day_left" msgid="8121013296375203759">"1 күнгө жетпеген убакыт калды"</string>
-    <string name="carrier_and_update_text" msgid="4351043160977741244">"<xliff:g id="ID_1">^1</xliff:g> тарабынан <xliff:g id="ID_2">^2</xliff:g> мурда жаңыртылды"</string>
-    <string name="no_carrier_update_text" msgid="4396108017586427442">"<xliff:g id="ID_1">^2</xliff:g> мурда жаңыртылды"</string>
-    <string name="carrier_and_update_now_text" msgid="9058821833613481573">"<xliff:g id="ID_1">^1</xliff:g> тарабынан жаңы эле жаңыртылды"</string>
-    <string name="no_carrier_update_now_text" msgid="5953142546373783189">"Азыр эле жаңыртылды"</string>
+    <string name="carrier_and_update_text" msgid="4351043160977741244">"<xliff:g id="ID_1">^1</xliff:g> тарабынан <xliff:g id="ID_2">^2</xliff:g> мурда жаңырды"</string>
+    <string name="no_carrier_update_text" msgid="4396108017586427442">"<xliff:g id="ID_1">^2</xliff:g> мурда жаңырды"</string>
+    <string name="carrier_and_update_now_text" msgid="9058821833613481573">"<xliff:g id="ID_1">^1</xliff:g> тарабынан жаңы эле жаңырды"</string>
+    <string name="no_carrier_update_now_text" msgid="5953142546373783189">"Азыр эле жаңырды"</string>
     <string name="launch_manage_plan_text" msgid="906657488611815787">"Планды көрүү"</string>
     <string name="app_data_usage" msgid="3878609885080232877">"Колдонмолордун трафиги"</string>
     <string name="data_usage_app_restricted" msgid="4570970078120010951">"чектелген"</string>
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"Бул колдонуучу үчүн орнотулган эмес"</string>
     <string name="permissions_label" msgid="2701446753515612685">"Уруксаттар"</string>
     <string name="notifications_label" msgid="6586089149665170731">"Билдирмелер"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"Сактагыч жана кеш"</string>
     <string name="application_version_label" msgid="8556889839783311649">"Версиясы: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"Бир да уруксат берилген жок"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"Бир да уруксат суралган жок"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"Ички сактагычтын %s ээлеп турат"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"Дайындардын колдонулушу"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"Колдонмолордун трафиги"</string>
     <string name="computing_size" msgid="5791407621793083965">"Эсептелүүдө…"</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"Жакында изделген жерлер"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"Жакында изделген жерлер жок"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"Колдонмонун уруксаттары"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"Издөө"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"Жайгашкан жерди аныктоо кызматтары"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Wi‑Fi тармактарын издөө"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Wi-Fi өчүп турса да, колдонмолор менен кызматтарга Wi-Fi тармактарын издегенге уруксат бересиз. Бул параметр менен жайгашкан жерди тагыраак аныктоого болот."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"Bluetooth түзмөктөрүн издөө"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"Bluetooth өчүп турса да, колдонмолор менен кызматтарга жакын жердеги түзмөктөрдү издегенге уруксат бересиз. Бул параметр менен жайгашкан жерди тагыраак аныктоого болот."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"Тутум"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"Тутум жаңыртуулары"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Android версиясы"</string>
@@ -374,7 +371,7 @@
     <string name="safety_and_regulatory_info" msgid="1204127697132067734">"Коопсуздук жана стандарттарга жооп берүү"</string>
     <string name="copyright_title" msgid="4220237202917417876">"Автордук укук"</string>
     <string name="license_title" msgid="936705938435249965">"Уруксаттама"</string>
-    <string name="terms_title" msgid="5201471373602628765">"Шарттар жана жоболор"</string>
+    <string name="terms_title" msgid="5201471373602628765">"Пайдалануу шарттары"</string>
     <string name="webview_license_title" msgid="6442372337052056463">"WebView тутум уруксаттамалары"</string>
     <string name="wallpaper_attributions" msgid="9201272150014500697">"Тушкагаздар"</string>
     <string name="wallpaper_attributions_values" msgid="4292446851583307603">"Спутниктик сүрөттөр:\n©2014 CNES/Astrium, DigitalGlobe, Bluesky"</string>
@@ -461,7 +458,7 @@
     </plurals>
     <string name="add_user_error_title" msgid="3206300411663817038">"Жаңы колдонуучу кошулбай калды"</string>
     <string name="delete_user_dialog_title" msgid="3422867434431562007">"Бул колдонуучуну өчүрөсүзбү?"</string>
-    <string name="delete_user_dialog_message" msgid="4346777604351785057">"Бардык колдонмолор жана дайындар жок кылынат."</string>
+    <string name="delete_user_dialog_message" msgid="4346777604351785057">"Бардык колдонмолор жана дайындар өчүрүлөт."</string>
     <string name="delete_user_error_title" msgid="7609819398530124827">"Колдонуучу өчүрүлгөн жок."</string>
     <string name="delete_user_error_dismiss" msgid="429156446763738273">"Четке кагуу"</string>
     <string name="delete_user_error_retry" msgid="5116434895572670563">"Кайталоо"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> катталган жок"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"Ишенимдүү түзмөктү кошууда аутентификация ыкмасын кошуу талап кылынат. Эгер ишенимдүү түзмөк жаныңызда болбосо, профилге кирүү үчүн аутентификациядан өтүү керек болот."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"Түзмөк ажыратылды."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"Эсептик дайындарды тазалоо"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"Бардык тастыктамалар өчүрүлөт"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"Бардык мазмундар өчүрүлсүнбү?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"Эсептик дайындар сакталчу жер тазаланды."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"Эсептик дайындар сакталчу жерди тазалоо мүмкүн эмес."</string>
     <string name="forget" msgid="3971143908183848527">"Унутулсун"</string>
     <string name="connect" msgid="5861699594602380150">"Туташтыруу"</string>
     <string name="disconnect" msgid="6140789953324820336">"Ажыратуу"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Ушуну менен демо аккаунт жок кылынып, тутум кайра башынан жөндөлөт. Колдонуучунун бардык дайындары өчүрүлөт."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Демо режимден чыгуу"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"ЧЕТКЕ КАГУУ"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"Унаа айдаганда бул функция жеткиликтүү эмес."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"Унаа айдап баратканда колдонуучуну кошууга болбойт."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"Унаа айдаганда бул функция жеткиликтүү эмес"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"Унаа айдап баратканда колдонуучуну кошууга болбойт"</string>
 </resources>
diff --git a/res/values-lo/config.xml b/res/values-lo/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-lo/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index d0c667e..dda636b 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"ບໍ່ໄດ້ຕິດຕັ້ງສຳລັບຜູ້ໃຊ້ນີ້"</string>
     <string name="permissions_label" msgid="2701446753515612685">"ການອະນຸຍາດ"</string>
     <string name="notifications_label" msgid="6586089149665170731">"ການແຈ້ງເຕືອນ"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"ບ່ອນຈັດເກັບຂໍ້ມູນ ແລະ ແຄສ"</string>
     <string name="application_version_label" msgid="8556889839783311649">"ເວີຊັນ: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"ບໍ່ໄດ້ໃຫ້ການອະນຸຍາດໃດ"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"ບໍ່ມີການຮ້ອງຂໍການອະນຸຍາດໃດ"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s ໃນພື້ນທີ່ຈັດເກັບພາຍໃນ"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"ການໃຊ້ຂໍ້ມູນ"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"ການໃຊ້ຂໍ້ມູນແອັບ"</string>
     <string name="computing_size" msgid="5791407621793083965">"ກຳລັງຄຳນວນ..."</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"ຄຳຂໍຂໍ້ມູນສະຖານທີ່ຫຼ້າສຸດ"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"ບໍ່ມີຄຳຂໍຂໍ້ມູນສະຖານທີ່ຫຼ້າສຸດ"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"ການອະນຸຍາດລະດັບແອັບ"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"ການສະແກນ"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"ການບໍລິການສະຖານທີ່"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"ການສະແກນ Wi‑Fi"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"ອະນຸຍາດໃຫ້ແອັບ ແລະ ການບໍລິການຕ່າງໆສະແກນຫາເຄືອຂ່າຍ Wi-Fi ໄດ້ທຸກເມື່ອ, ເຖິງແມ່ນໃນເວລາທີ່ Wi-Fi ປິດຢູ່ກໍຕາມ. ສາມາດໃຊ້ຄຸນສົມບັດນີ້ເພື່ອປັບປຸງຄຸນສົມບັດ ແລະ ການບໍລິການຕ່າງໆທີ່ອີງໃສ່ສະຖານທີ່ໄດ້."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"ການສະແກນ Bluetooth"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"ອະນຸຍາດໃຫ້ແອັບ ແລະ ການບໍລິການຕ່າງໆສະແກນຫາອຸປະກອນທີ່ຢູ່ໃກ້ຄຽງໄດ້ທຸກເມື່ອ, ເຖິງແມ່ນໃນເວລາທີ່ Bluetooth ປິດຢູ່ກໍຕາມ. ສາມາດໃຊ້ຄຸນສົມບັດນີ້ເພື່ອປັບປຸງຄຸນສົມບັດ ແລະ ການບໍລິການຕ່າງໆທີ່ອີງໃສ່ສະຖານທີ່ໄດ້."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"ລະບົບ"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"ການອັບເດດລະບົບ"</string>
     <string name="firmware_version" msgid="8491753744549309333">"ເວີຊັນ Android"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"ການລົງທະບຽນ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ບໍ່ສຳເລັດ"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"ການເພີ່ມອຸປະກອນທີ່ເຊື່ອຖືໄດ້ກຳນົດໃຫ້ທ່ານຕ້ອງຕັ້ງຄ່າວິທີການກວດຮັບຮອງຄວາມຖືກຕ້ອງເປັນຂັ້ນຕອນຕໍ່ໄປ. ຖ້າທ່ານບໍ່ມີອຸປະກອນທີ່ເຊື່ອຖືໄດ້ຢູ່ນຳທ່ານ, ຈໍາເປັນຕ້ອງມີການກວດຮັບຮອງຄວາມຖືກຕ້ອງເພື່ອເຂົ້າເຖິງໂປຣໄຟລ໌ຂອງທ່ານ."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"ຕັດການເຊື່ອມຕໍ່ອຸປະກອນແລ້ວ"</string>
+    <string name="credentials_reset" msgid="873900550885788639">"ລຶບຂໍ້ມູນຮັບຮອງ"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"ລຶບໃບຮັບຮອງທັງໝົດອອກ"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"ລຶບເນື້ອຫາທັງໝົດອອກ?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"ພື້ນທີ່ຈັດເກັບຂໍ້ມູນປະຈຳຕົວຖືກລຶບແລ້ວ."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"ບໍ່ສາມາດບ່ອນຈັດເກັບຂໍ້ມູນປະຈຳຕົວໄດ້."</string>
     <string name="forget" msgid="3971143908183848527">"ລືມ"</string>
     <string name="connect" msgid="5861699594602380150">"ເຊື່ອມຕໍ່"</string>
     <string name="disconnect" msgid="6140789953324820336">"ຕັດການເຊື່ອມຕໍ່"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"ນີ້ຈະລຶບບັນຊີສາທິດ ແລະ ຣີເຊັດລະບົບເປັນຂໍ້ມູນໂຮງງານ. ຂໍ້ມູນຜູ້ໃຊ້ທັງໝົດຈະເສຍໄປ."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"ອອກຈາກໂໝດສາທິດ"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"ປິດໄວ້"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"ຄຸນສົມບັດບໍ່ສາມາດໃຊ້ໄດ້ໃນເວລາຂັບລົດ."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"ບໍ່ສາມາດເພີ່ມຜູ້ໃຊ້ໃນຂະນະທີ່ຂັບລົດໄດ້."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"ຄຸນສົມບັດບໍ່ສາມາດໃຊ້ໄດ້ໃນເວລາຂັບລົດ"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"ບໍ່ສາມາດເພີ່ມຜູ້ໃຊ້ໃນຂະນະທີ່ຂັບລົດໄດ້"</string>
 </resources>
diff --git a/res/values-lt/config.xml b/res/values-lt/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-lt/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index b698e8c..1a82512 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -287,9 +287,11 @@
     <string name="not_installed" msgid="4218816013370552746">"Neįdiegta šiam naudotojui"</string>
     <string name="permissions_label" msgid="2701446753515612685">"Leidimai"</string>
     <string name="notifications_label" msgid="6586089149665170731">"Pranešimai"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"Saugykla ir talpykla"</string>
     <string name="application_version_label" msgid="8556889839783311649">"Versija: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"Nėra suteiktų leidimų"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"Nėra užklausų dėl leidimų"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s vidinėje atmintyje"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"Duomenų naudojimas"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"Progr. duomenų naudojimas"</string>
     <string name="computing_size" msgid="5791407621793083965">"Skaičiuojama…"</string>
@@ -350,12 +352,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"Pastarosios vietovės užklausos"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"Nėra jokių pastarųjų vietovių užklausų"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"Programos lygio leidimai"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"Nuskaitymas"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"Vietovės paslaugos"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"„Wi‑Fi“ nuskaitymas"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Leisti programoms ir paslaugoms bet kuriuo metu nuskaityti ieškant „Wi‑Fi“ tinklų, net kai „Wi‑Fi“ išjungtas. Tai galima naudoti norint, pvz., tobulinti pagal vietovę teikiamas funkcijas ir paslaugas."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"„Bluetooth“ nuskaitymas"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"Leisti programoms ir paslaugoms bet kuriuo metu nuskaityti ieškant netoliese esančių įrenginių, net kai „Bluetooth“ išjungtas. Tai galima naudoti norint, pvz., tobulinti pagal vietovę teikiamas funkcijas ir paslaugas."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"Sistema"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"Sistemos naujiniai"</string>
     <string name="firmware_version" msgid="8491753744549309333">"„Android“ versija"</string>
@@ -664,6 +661,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"„<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“ įrenginio registracija nepavyko"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"Pridėję patikimą įrenginį, paskui turėsite nustatyti autentifikavimo metodą. Jei su savimi patikimo įrenginio neturite, autentifikavimas bus būtinas norint pasiekti profilį."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"Įrenginys atjungtas."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"Išvalyti prisijungimo duomenis"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"Pašalinti visus sertifikatus"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"Pašalinti visą turinį?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"Prisijungimo duomenų atmintinė ištrinta."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"Nepavyko ištrinti prisijungimo duomenų atmintinės."</string>
     <string name="forget" msgid="3971143908183848527">"Pamiršti"</string>
     <string name="connect" msgid="5861699594602380150">"Prisijungti"</string>
     <string name="disconnect" msgid="6140789953324820336">"Atsijungti"</string>
@@ -679,6 +681,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Tai atlikus bus ištrinta demonstracinė paskyra ir atkurti gamykliniai sistemos duomenys. Visi naudotojo duomenys bus prarasti."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Išeiti iš dem. režimo"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"ATSISAKYTI"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"Funkcija nepasiekiama vairuojant."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"Negalima pridėti naudotojo vairuojant."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"Funkcija nepasiekiama vairuojant"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"Negalima pridėti naudotojo vairuojant"</string>
 </resources>
diff --git a/res/values-lv/config.xml b/res/values-lv/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-lv/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 44b9059..ee3292d 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -285,9 +285,11 @@
     <string name="not_installed" msgid="4218816013370552746">"Nav instalēta šim lietotājam"</string>
     <string name="permissions_label" msgid="2701446753515612685">"Atļaujas"</string>
     <string name="notifications_label" msgid="6586089149665170731">"Paziņojumi"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"Krātuve un kešatmiņa"</string>
     <string name="application_version_label" msgid="8556889839783311649">"Versija: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"Nav piešķirta neviena atļauja."</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"Nav pieprasīta neviena atļauja."</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s: iekšējā atmiņa"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"Datu lietojums"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"Lietotnes datu lietojums"</string>
     <string name="computing_size" msgid="5791407621793083965">"Notiek aprēķināšana…"</string>
@@ -347,12 +349,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"Neseni atrašanās vietu pieprasījumi"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"Nav nesenu atrašanās vietu pieprasījumu"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"Lietotnes līmeņa atļaujas"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"Notiek meklēšana"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"Atrašanās vietu pakalpojumi"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Wi‑Fi meklēšana"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Ļauj lietotnēm un pakalpojumiem meklēt Wi-Fi tīklus vienmēr, pat ja Wi-Fi ir izslēgts. Šo iestatījumu var izmantot, piemēram, lai uzlabotu atrašanās vietas funkcijas un pakalpojumus."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"Bluetooth meklēšana"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"Ļauj lietotnēm un pakalpojumiem meklēt tuvumā esošas ierīces vienmēr, pat ja Bluetooth ir izslēgts. Šo iestatījumu var izmantot, piemēram, lai uzlabotu atrašanās vietas funkcijas un pakalpojumus."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"Sistēma"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"Sistēmas atjauninājumi"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Android versija"</string>
@@ -652,6 +649,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"Neizdevās reģistrēt ierīci <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"Pievienojot uzticamu ierīci, jums ir jāiestata arī autentifikācijas metode. Autentifikācija būs nepieciešama, lai jūs varētu piekļūt savam profilam, ja jums nebūs līdzi jūsu uzticamā ierīce."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"Ierīce ir atvienota."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"Notīrīt akreditācijas datus"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"Noņemt visus sertifikātus"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"Vai noņemt visu saturu?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"Akreditācijas datu atmiņa ir izdzēsta."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"Neizdevās izdzēst akreditācijas datu atmiņu."</string>
     <string name="forget" msgid="3971143908183848527">"Aizmirst"</string>
     <string name="connect" msgid="5861699594602380150">"Izveidot savienojumu"</string>
     <string name="disconnect" msgid="6140789953324820336">"Atvienot"</string>
@@ -667,6 +669,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Tādējādi tiks dzēsts demonstrācijas konts un sistēmā tiks atiestatīti rūpnīcas dati. Visi lietotāja dati tiks zaudēti."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Iziet no demonstr. režīma"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"NERĀDĪT"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"Funkcija nav pieejama braukšanas laikā."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"Nevar pievienot lietotāju braukšanas laikā."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"Funkcija nav pieejama braukšanas laikā."</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"Nevar pievienot lietotāju braukšanas laikā."</string>
 </resources>
diff --git a/res/values-mk/config.xml b/res/values-mk/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-mk/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index db99c9f..dff6f4e 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"Не е инсталирано за корисников"</string>
     <string name="permissions_label" msgid="2701446753515612685">"Дозволи"</string>
     <string name="notifications_label" msgid="6586089149665170731">"Известувања"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"Капацитет и кеш"</string>
     <string name="application_version_label" msgid="8556889839783311649">"Верзија %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"Не се доделени дозволи"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"Не се побарани дозволи"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s во внатрешен капацитет"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"Потрошен сообраќај"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"Сообраќај на апликациите"</string>
     <string name="computing_size" msgid="5791407621793083965">"Пресметување…"</string>
@@ -317,11 +319,11 @@
     <string name="auto_launch_disable_text" msgid="3595315315092716391">"Не се поставени стандардни вредности."</string>
     <string name="auto_launch_enable_text" msgid="7230832269574106901">"Избравте оваа апликација да се стартува стандардно за некои дејства."</string>
     <string name="auto_launch_reset_text" msgid="590439611312092392">"Избришете ги стандардните вредности"</string>
-    <string name="app_launch_open_domain_urls_title" msgid="4705344946367759393">"Отвори поддржани врски"</string>
+    <string name="app_launch_open_domain_urls_title" msgid="4705344946367759393">"Отворај поддржани линкови"</string>
     <string name="app_link_open_always" msgid="5783167184335545230">"Отвори во апликацијава"</string>
     <string name="app_link_open_ask" msgid="7242075065136237456">"Секогаш прашувај"</string>
     <string name="app_link_open_never" msgid="2173174327831792316">"Не отворај во апликацијава"</string>
-    <string name="app_launch_supported_domain_urls_title" msgid="7345116365785981158">"Поддржани врски"</string>
+    <string name="app_launch_supported_domain_urls_title" msgid="7345116365785981158">"Поддржани линкови"</string>
     <string name="special_access" msgid="5730278220917123811">"Посебен пристап за апликации"</string>
     <string name="show_system" msgid="4401355756969485287">"Прикажи го системот"</string>
     <string name="hide_system" msgid="8845453295584638040">"Сокриј го системот"</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"Последни барања за локација"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"Нема неодамнешни барања за локација"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"Дозволи на ниво на апликација"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"Скенирање"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"Услуги според локација"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Скенирање на Wi‑Fi"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Дозволете апликациите и услугите да скенираат Wi-Fi мрежи во секое време, дури и кога Wi-Fi е исклучено. Ова може да се користи, на пример, за да се подобрат функциите и услугите базирани на локација."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"Скенирање на Bluetooth"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"Дозволете апликациите и услугите да скенираат уреди во близина во секое време, дури и кога Bluetooth е исклучен. Ова може да се користи, на пример, за да се подобрат функциите и услугите базирани на локација."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"Систем"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"Ажурирања на системот"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Верзија на Android"</string>
@@ -372,9 +369,9 @@
     <string name="manual" msgid="4819839169843240804">"Рачни поставки"</string>
     <string name="regulatory_labels" msgid="3165587388499646779">"Регулаторни етикети"</string>
     <string name="safety_and_regulatory_info" msgid="1204127697132067734">"Безбедност и регулаторно упатство"</string>
-    <string name="copyright_title" msgid="4220237202917417876">"Авторско право"</string>
+    <string name="copyright_title" msgid="4220237202917417876">"Авторски права"</string>
     <string name="license_title" msgid="936705938435249965">"Лиценца"</string>
-    <string name="terms_title" msgid="5201471373602628765">"Правила и услови"</string>
+    <string name="terms_title" msgid="5201471373602628765">"Одредби и услови"</string>
     <string name="webview_license_title" msgid="6442372337052056463">"Системски лиценци за WebView"</string>
     <string name="wallpaper_attributions" msgid="9201272150014500697">"Тапети"</string>
     <string name="wallpaper_attributions_values" msgid="4292446851583307603">"Извор на сателитски снимки:\n©2014 CNES/Astrium, DigitalGlobe, Bluesky"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"Регистрацијата на <xliff:g id="DEVICE_NAME">%1$s</xliff:g> не успеа"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"Ако додадете доверлив уред, ќе треба да поставите метод на проверка во следниот чекор. Ако доверливиот уред не ви е при рака, ќе ви биде потребна проверка за да пристапите до профилот."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"Врската со уредот се прекина."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"Исчисти акредитиви"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"Отстрани ги сите акредитиви"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"Дали да се отстранат сите содржини?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"Меморијата на акредитиви е избришана."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"Меморијата на акредитиви не може да се избрише."</string>
     <string name="forget" msgid="3971143908183848527">"Избриши го"</string>
     <string name="connect" msgid="5861699594602380150">"Поврзи"</string>
     <string name="disconnect" msgid="6140789953324820336">"Исклучи"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Ова ќе ја избрише демо-сметката и ќе ги ресетира фабричките податоци на системот. Сите податоци на корисникот ќе се изгубат."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Излези од демо-режим"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"ОТФРЛИ"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"Функцијата не е достапна при возење."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"Не може да се додаде корисник додека возите."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"Функцијата не е достапна при возење"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"Не може да се додаде корисник додека возите"</string>
 </resources>
diff --git a/res/values-ml/config.xml b/res/values-ml/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-ml/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index d7c1a68..d01ffa1 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"ഈ ഉപയോക്താവിനായി ഇൻസ്‌റ്റാൾ ചെയ്‌തിട്ടില്ല"</string>
     <string name="permissions_label" msgid="2701446753515612685">"അനുമതികൾ"</string>
     <string name="notifications_label" msgid="6586089149665170731">"അറിയിപ്പുകൾ"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"സ്‌റ്റോറേജും കാഷെയും"</string>
     <string name="application_version_label" msgid="8556889839783311649">"പതിപ്പ്: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"അനുമതികളൊന്നും അനുവദിച്ചില്ല"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"അനുമതികളൊന്നും അഭ്യർത്ഥിച്ചില്ല"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"ഉള്ളിലെ മെമ്മറിയിൽ %s"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"ഡാറ്റ ഉപയോഗം"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"ആപ്പ് ഡാറ്റ ഉപയോഗം"</string>
     <string name="computing_size" msgid="5791407621793083965">"കണക്കാക്കുന്നു…"</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"അടുത്തിടെയുള്ള ലൊക്കേഷൻ അഭ്യർത്ഥനകൾ"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"അടുത്തിടെയുള്ള ലൊക്കേഷൻ അഭ്യർത്ഥനകളൊന്നുമില്ല"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"ആപ്പ്-തല അനുമതികൾ"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"സ്‌കാൻ ചെയ്യുന്നു"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"ലൊക്കേഷൻ സേവനങ്ങൾ"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"വൈഫൈ സ്‌കാനിംഗ്"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"വൈഫൈ ഓഫാണെങ്കിൽ പോലും, ഏതുസമയത്തും വൈഫൈ നെറ്റ്‌വർക്കുകൾ സ്‌കാൻ ചെയ്യാൻ ആപ്പുകളെയും സേവനങ്ങളെയും അനുവദിക്കുക. ഉദാഹരണത്തിന്, ലൊക്കേഷൻ‌ അടിസ്ഥാനമാക്കിയുള്ള ഫീച്ചറുകളും സേവനങ്ങളും മെച്ചപ്പെടുത്താൻ ഇത് ഉപയോഗിക്കാം."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"Bluetooth സ്‌കാനിംഗ്"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"Bluetooth ഓഫാണെങ്കിൽ പോലും, ഏതുസമയത്തും അടുത്തുള്ള ഉപകരണങ്ങൾ സ്‌കാൻ ചെയ്യാൻ ആപ്പുകളെയും സേവനങ്ങളെയും അനുവദിക്കുക. ഉദാഹരണത്തിന്, ലൊക്കേഷൻ‌ അടിസ്ഥാനമാക്കിയുള്ള ഫീച്ചറുകളും സേവനങ്ങളും മെച്ചപ്പെടുത്താൻ ഇത് ഉപയോഗിക്കാം."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"സിസ്റ്റം"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"സി‌സ്‌റ്റം അപ്‌ഡേറ്റുകൾ"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Android പതിപ്പ്"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> എൻറോൾമെന്റ് പരാജയപ്പെട്ടു"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"ഒരു വിശ്വസ്‌ത ഉപകരണം ചേർക്കുന്നതിന്, അടുത്തതായി ഒരു പരിശോധിച്ചുറപ്പിക്കൽ രീതി നിങ്ങൾ സജ്ജീകരിക്കേണ്ടതുണ്ട്. വിശ്വസ്‌ത ഉപകരണം നിങ്ങളുടെ കൈവശമില്ലെങ്കിൽ, നിങ്ങളുടെ പ്രൊഫൈൽ ആക്‌സസ് ചെയ്യാൻ പരിശോധിച്ചുറപ്പിക്കൽ ആവശ്യമാണ്."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"ഉപകരണം വിച്ഛേദിച്ചു."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"ക്രെഡൻഷ്യലുകൾ മായ്ക്കുക"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"എല്ലാ സർട്ടിഫിക്കറ്റുകളും നീക്കം ചെയ്യുക"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"എല്ലാ ഉള്ളടക്കങ്ങളും നീക്കം ചെയ്യണോ?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"ക്രെഡൻഷ്യൽ സ്റ്റോറേജ് മായ്ച്ചു."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"ക്രെഡൻഷ്യൽ സ്റ്റോറേജ് മായ്ക്കാനായില്ല."</string>
     <string name="forget" msgid="3971143908183848527">"മറക്കുക"</string>
     <string name="connect" msgid="5861699594602380150">"കണക്റ്റ് ചെയ്യുക"</string>
     <string name="disconnect" msgid="6140789953324820336">"വിച്ഛേദിക്കുക"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"ഇത് ഡെമോ അക്കൗണ്ട് ഇല്ലാതാക്കുകയും സിസ്‌റ്റം ഫാക്‌ടറി ഡാറ്റ പുനഃക്രമീകരിക്കുകയും ചെയ്യും. എല്ലാ ഉപയോക്തൃ ഡാറ്റയും നഷ്‌ടമാവും."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"ഡെമോയിൽ നിന്ന് പുറത്തുകടക്കുക"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"ഡിസ്‌മിസ് ചെയ്യുക"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"ഡ്രൈവ് ചെയ്യുമ്പോൾ ഫീച്ചർ ലഭ്യമല്ല."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"ഡ്രൈവ് ചെയ്യുമ്പോൾ ഉപയോക്താവിനെ ചേർക്കാനാവില്ല."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"ഡ്രൈവ് ചെയ്യുമ്പോൾ ഫീച്ചർ ലഭ്യമല്ല"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"ഡ്രൈവ് ചെയ്യുമ്പോൾ ഉപയോക്താവിനെ ചേർക്കാനാവില്ല"</string>
 </resources>
diff --git a/res/values-mn/config.xml b/res/values-mn/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-mn/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 32f8b52..aee1f96 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"Энэ хэрэглэгчид зориулан суулгаагүй"</string>
     <string name="permissions_label" msgid="2701446753515612685">"Зөвшөөрлүүд"</string>
     <string name="notifications_label" msgid="6586089149665170731">"Мэдэгдэл"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"Хадгалах сан болон завсрын санах ойд хадгалах"</string>
     <string name="application_version_label" msgid="8556889839783311649">"Хувилбар: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"Зөвшөөрөл олгоогүй байна"</string>
-    <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"Хүссэн зөвшөөрөл алга"</string>
+    <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"Ямар ч зөвшөөрөл хүсээгүй байна"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s-н дотоод сан"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"Дата ашиглалт"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"Аппын дата ашиглалт"</string>
     <string name="computing_size" msgid="5791407621793083965">"Тооцоолж байна…"</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"Саяхны байршлын хүсэлтүүд"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"Саяхны байршлын хүсэлт алга"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"Аппын түвшний зөвшөөрөл"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"Скан хийж байна"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"Байршлын үйлчилгээ"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Wi-Fi скан хийх"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Апп болон үйлчилгээнд Wi‑Fi унтраалттай үед ч Wi‑Fi сүлжээг хүссэн үедээ скан хийхийг зөвшөөрнө үү. Үүнийг байршилд суурилсан онцлогууд болон үйлчилгээнүүдийг сайжруулахад ашиглаж магадгүй."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"Bluetooth скан хийх"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"Апп болон үйлчилгээнд Bluetooth унтраалттай үед ч ойролцоох төхөөрөмжийг хүссэн үедээ скан хийхийг зөвшөөрнө үү. Үүнийг байршилд суурилсан онцлогууд болон үйлчилгээнүүдийг сайжруулахад ашиглаж магадгүй."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"Систем"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"Системийн шинэчлэлт"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Андройд хувилбар"</string>
@@ -369,7 +366,7 @@
     <string name="about_settings_summary" msgid="7975072809083281401">"Хууль эрх зүйн мэдээлэл, төлөв, програм хангамжийн хувилбарыг харах"</string>
     <string name="legal_information" msgid="1838443759229784762">"Хууль эрх зүйн мэдээлэл"</string>
     <string name="contributors_title" msgid="7698463793409916113">"Хувь оруулагч"</string>
-    <string name="manual" msgid="4819839169843240804">"Гарын авлага"</string>
+    <string name="manual" msgid="4819839169843240804">"Гар аргаар"</string>
     <string name="regulatory_labels" msgid="3165587388499646779">"Зохицуулалтын шошго"</string>
     <string name="safety_and_regulatory_info" msgid="1204127697132067734">"Аюулгүй байдал &amp; зохицуулалтын гарын авлага"</string>
     <string name="copyright_title" msgid="4220237202917417876">"Зохиогчийн эрх"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>-г бүртгүүлж чадсангүй"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"Итгэмжлэгдсэн төхөөрөмж нэмснээр танаас дараа нь нотолгооны хэлбэр тохируулахыг шаарддаг. Хэрэв та итгэмжлэгдсэн төхөөрөмжөө өөртөө авч яваагүй бол нотлохын тулд профайлдаа хандахыг шаардана."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"Төхөөрөмж салсан байна."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"Мандат үнэмлэх арилгах"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"Бүх сертификатыг хасах"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"Бүх контентыг хасах уу?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"Итгэмжлэлийн санг устгасан."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"Итгэмжлэлийн санг устгаж чадсангүй."</string>
     <string name="forget" msgid="3971143908183848527">"Мартах"</string>
     <string name="connect" msgid="5861699594602380150">"Холбох"</string>
     <string name="disconnect" msgid="6140789953324820336">"Салгах"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Энэ нь туршилтын бүртгэлийг устгах бөгөөд системийг үйлдвэрээс гарсан төлөвт шинэчилнэ. Хэрэглэгчийн бүх өгөгдөл устах болно."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Туршилтаас гарах"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"ҮЛ ХЭРЭГСЭХ"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"Энэ онцлог жолоо барьж байх үед боломжгүй."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"Жолоо барьж байх үед хэрэглэгч нэмэх боломжгүй."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"Жолоо барьж байх үед онцлог боломжгүй"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"Жолоо барьж байх үед хэрэглэгч нэмэх боломжгүй"</string>
 </resources>
diff --git a/res/values-mr/config.xml b/res/values-mr/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-mr/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index d6e29c8..120143c 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"या वापरकर्त्यासाठी इंस्टॉल केले नाही"</string>
     <string name="permissions_label" msgid="2701446753515612685">"परवानग्या"</string>
     <string name="notifications_label" msgid="6586089149665170731">"सूचना"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"स्टोरेज आणि कॅशे"</string>
     <string name="application_version_label" msgid="8556889839783311649">"आवृत्त्या: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"कोणत्याही परवानग्यांना मंजूरी दिली नाही"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"कोणत्याही परवानग्यांची विनंती केली नाही"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"संचयमध्ये %s"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"डेटा वापर"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"ॲप डेटा वापर"</string>
     <string name="computing_size" msgid="5791407621793083965">"गणना करत आहे…"</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"अलीकडील स्थान विनंत्या"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"अलीकडील कोणत्याही स्थान विनंत्या नाहीत"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"ॲप पातळी परवानग्या"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"स्कॅन करत आहे"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"स्‍थान सेवा"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"वाय-फाय स्कॅन करत आहे"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"वाय-फाय बंद असले तरीही अ‍ॅप्स आणि सेवांना वाय-फाय नेटवर्क कधीही स्कॅन करण्याची अनुमती द्या. याचा वापर स्थान आधारित वैशिष्ट्ये आणि सेवा सुधारणे अशा कामांसाठी केला जाऊ शकतो."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"ब्लूटूथ स्कॅन करत आहे"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"ब्लूटूथ बंद असले, तरीही अ‍ॅप्स आणि सेवांना जवळपासची डिव्हाइस कधीही स्कॅन करण्याची अनुमती द्या. याचा वापर उदाहरणार्थ, स्थान आधारित वैशिष्ट्ये आणि सेवा सुधारण्यासाठी केला जाऊ शकतो."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"सिस्टम"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"सिस्टम अपडेट"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Android आवृत्ती"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>ची नोंदणी करता आली नाही"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"विश्वासू डिव्हाइस जोडण्यााठी तुम्हाला यापुढे ऑथेंटिकेशन सेट करण्याची आवश्यकता आहे. तुमच्याजवळ तुमचे विश्वासू डिव्हाइस नसल्यास, ऑथेंटिकेशनला तुमची प्रोफाइल ॲक्सेस करण्याची आवश्यकता असेल."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"डिव्हाइस डिस्कनेक्ट केले आहे."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"क्रेडेन्शियल साफ करा"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"सर्व प्रमाणपत्रे काढून टाका"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"सर्व आशय काढून टाकायचा का?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"क्रेडेन्शियल स्टोरेज मिटवले आहे."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"क्रेडेंशियल स्टोरेज मिटवता आले नाही."</string>
     <string name="forget" msgid="3971143908183848527">"विसरा"</string>
     <string name="connect" msgid="5861699594602380150">"कनेक्ट करा"</string>
     <string name="disconnect" msgid="6140789953324820336">"डिस्कनेक्ट करा"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"हे डेमो खाते हटवेल आणि फॅक्टरी डेटा सिस्टम रीसेट करेल. सर्व वापरकर्ता डेटा गमावेल."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"डेमो मोडमधून बाहेर पडा"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"डिसमिस करा"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"ड्राइव्ह करताना वैशिष्ट्य उपलब्ध नाही."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"ड्राइव्ह करत असताना वापरकर्त्याला जोडू शकत नाही."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"ड्राइव्ह करताना वैशिष्ट्य उपलब्ध नाही"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"ड्राइव्ह करत असताना वापरकर्त्याला जोडू शकत नाही"</string>
 </resources>
diff --git a/res/values-ms/config.xml b/res/values-ms/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-ms/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 7dafff3..a5b75d9 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"Tidak dipasang untuk pengguna ini"</string>
     <string name="permissions_label" msgid="2701446753515612685">"Kebenaran"</string>
     <string name="notifications_label" msgid="6586089149665170731">"Pemberitahuan"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"Storan &amp; cache"</string>
     <string name="application_version_label" msgid="8556889839783311649">"Versi: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"Tiada kebenaran diberikan"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"Tiada kebenaran diminta"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s dalam storan dalaman"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"Penggunaan data"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"Penggunaan data apl"</string>
     <string name="computing_size" msgid="5791407621793083965">"Mengira…"</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"Permintaan Lokasi Terbaharu"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"Tiada permintaan lokasi terbaharu"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"Kebenaran tahap apl"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"Mengimbas"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"Perkhidmatan Lokasi"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Pengimbasan Wi‑Fi"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Benarkan apl dan perkhidmatan mengimbas untuk mengesan rangkaian Wi-Fi pada bila-bila masa, meskipun apabila Wi-Fi dimatikan. Ini dapat digunakan, contohnya, untuk meningkatkan ciri dan perkhidmatan berasaskan lokasi."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"Pengimbasan Bluetooth"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"Benarkan apl dan perkhidmatan mengimbas untuk mengesan peranti berdekatan pada bila-bila masa, meskipun apabila Bluetooth dimatikan. Ini dapat digunakan, contohnya, untuk meningkatkan ciri dan perkhidmatan berasaskan lokasi."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"Sistem"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"Kemas kini sistem"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Versi Android"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"Pendaftaran <xliff:g id="DEVICE_NAME">%1$s</xliff:g> gagal"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"Penambahan peranti yang dipercayai memerlukan anda menetapkan kaedah pengesahan selepas ini. Jika peranti yang dipercayai tiada dengan anda, pengesahan perlu mengakses profil anda."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"Peranti diputuskan sambungan."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"Kosongkan bukti kelayakan"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"Alih keluar semua sijil"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"Alih keluar semua kandungan?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"Storan bukti kelayakan dipadamkan."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"Storan bukti kelayakan tidak dapat dipadamkan."</string>
     <string name="forget" msgid="3971143908183848527">"Lupakan"</string>
     <string name="connect" msgid="5861699594602380150">"Sambung"</string>
     <string name="disconnect" msgid="6140789953324820336">"Putuskan sambungan"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Tindakan ini akan memadamkan akaun tunjuk cara dan membuat tetapan semula data kilang pada sistem. Semua data pengguna akan hilang."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Keluar drpd Tunjuk Cara"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"KETEPIKAN"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"Ciri tidak tersedia semasa anda memandu."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"Tidak dapat menambah pengguna semasa memandu."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"Ciri tidak tersedia semasa anda memandu"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"Tidak dapat menambah pengguna semasa memandu"</string>
 </resources>
diff --git a/res/values-my/config.xml b/res/values-my/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-my/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index b9906a1..bd25fb1 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"ဤအသုံးပြုသူအတွက် ထည့်သွင်းမထားပါ"</string>
     <string name="permissions_label" msgid="2701446753515612685">"ခွင့်ပြုချက်များ"</string>
     <string name="notifications_label" msgid="6586089149665170731">"အကြောင်းကြားချက်များ"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"သိုလှောင်ခန်းနှင့် ကက်ရှ်"</string>
     <string name="application_version_label" msgid="8556889839783311649">"ဗားရှင်း− %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"ခွင့်ပြုထားသည့် အရာများ မရှိပါ"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"တောင်းဆိုထားသော ခွင့်ပြုချက်များ မရှိပါ"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"စက်အတွင်းသိမ်းဆည်းရန်နေရာတွင် %s"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"ဒေတာသုံးစွဲမှု"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"အက်ပ်ဒေတာ သုံးစွဲမှု"</string>
     <string name="computing_size" msgid="5791407621793083965">"တွက်ချက်နေသည်…"</string>
@@ -345,12 +347,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"လတ်တလော တည်နေရာတောင်းဆိုချက်များ"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"လတ်တလော တည်နေရာတောင်းဆိုချက်များ မရှိပါ"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"အက်ပ်အဆင့် ခွင့်ပြုချက်များ"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"စကင်ဖတ်နေသည်"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"တည်နေရာဝန်ဆောင်မှုများ"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Wi-Fi ရှာဖွေနေသည်"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Wi‑Fi ကို ပိတ်ထားသော်လည်း အနီးအနားရှိ Wi-Fi ကွန်ရက်များကို အချိန်မရွေးရှာဖွေရန် အက်ပ်နှင့် ဝန်ဆောင်မှုများအား ခွင့်ပြုပါ။ ဥပမာအားဖြင့် ၎င်းကို တည်နေရာအခြေပြု လုပ်ဆောင်ချက်နှင့် ဝန်ဆောင်မှုများ တိုးတက်လာစေရန် အသုံးပြုနိုင်ပါသည်။"</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"ဘလူးတုသ် ရှာဖွေနေသည်"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"ဘလူးတုသ်ကို ပိတ်ထားသော်လည်း အနီးအနားရှိ စက်ပစ္စည်းများကို အချိန်မရွေးရှာဖွေရန် အက်ပ်နှင့် ဝန်ဆောင်မှုများအား ခွင့်ပြုပါ။ ဥပမာအားဖြင့် ၎င်းကို တည်နေရာအခြေပြု လုပ်ဆောင်ချက်နှင့် ဝန်ဆောင်မှုများ တိုးတက်လာစေရန် အသုံးပြုနိုင်ပါသည်။"</string>
     <string name="system_setting_title" msgid="6864599341809463440">"စနစ်"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"စနစ်အပ်ဒိတ်များ"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Android ဗားရှင်း"</string>
@@ -641,6 +638,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ကို စာရင်းသွင်း၍ မရပါ"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"စိတ်ချရသည့် ကိရိယာတစ်ခုကို ထည့်ပြီးပါက အထောက်အထားစိစစ်ခြင်း နည်းလမ်းတစ်ခုကို သတ်မှတ်ရပါမည်။ သင့်တွင် စိတ်ချရသည့် ကိရိယာ အတူပါမလာပါက သင့်ပရိုဖိုင်ကို ဝင်သုံးခွင့်ရရန် အထောက်အထားစိစစ်ခြင်း လိုအပ်ပါလိမ့်မည်။"</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"စက်ချိတ်ဆက်မှု ပြတ်တောက်သွားသည်။"</string>
+    <string name="credentials_reset" msgid="873900550885788639">"အထောက်အထားများကို ရှင်းလင်းခြင်း"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"အသိအမှတ်ပြုလက်မှတ်အားလုံးကို ဖယ်ရှားရန်"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"အကြောင်းအရာအားလုံးကို ဖယ်ရှားမလား။"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"ယုံကြည်စိတ်ချရသောသိုလှောင်ရာနေရာအား ဖျက်လိုက်ပါပြီ။"</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"သိုလှောင်ရာနေရာအား ဖျက်၍မရပါ။"</string>
     <string name="forget" msgid="3971143908183848527">"မေ့ပစ်ရန်"</string>
     <string name="connect" msgid="5861699594602380150">"ချိတ်ရန်"</string>
     <string name="disconnect" msgid="6140789953324820336">"ချိတ်ဆက်မှု ဖြုတ်ရန်"</string>
@@ -656,6 +658,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"၎င်းက သရုပ်ပြအကောင့်ကို ဖျက်ပြီး စနစ်ကို စက်ရုံထုတ်အခြေအနေပြန်ယူပါမည်။ အသုံးပြုသူ ဒေတာအားလုံး ရှိတော့မည်မဟုတ်ပါ။"</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"သရုပ်ပြမှ ထွက်ရန်"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"ပယ်ရန်"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"ကားမောင်းနေစဉ် ဝန်ဆောင်မှု မရနိုင်ပါ။"</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"ကားမောင်းနေစဉ် အသုံးပြုသူကို ထည့်၍မရပါ။"</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"ကားမောင်းနေစဉ် ဝန်ဆောင်မှု မရနိုင်ပါ"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"ကားမောင်းနေစဉ် အသုံးပြုသူကို ထည့်၍မရပါ"</string>
 </resources>
diff --git a/res/values-nb/config.xml b/res/values-nb/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-nb/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 4e1ffc2..e546cce 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"Ikke installert for brukeren"</string>
     <string name="permissions_label" msgid="2701446753515612685">"Tillatelser"</string>
     <string name="notifications_label" msgid="6586089149665170731">"Varsler"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"Lagring og buffer"</string>
     <string name="application_version_label" msgid="8556889839783311649">"Versjon: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"Ingen tillatelser er gitt"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"Ingen tillatelser er forespurt"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s i internminne"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"Databruk"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"Appens databruk"</string>
     <string name="computing_size" msgid="5791407621793083965">"Beregner …"</string>
@@ -323,8 +325,8 @@
     <string name="app_link_open_never" msgid="2173174327831792316">"Ikke åpne med denne appen"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="7345116365785981158">"Støttede linker"</string>
     <string name="special_access" msgid="5730278220917123811">"Spesiell apptilgang"</string>
-    <string name="show_system" msgid="4401355756969485287">"Vis systemapper"</string>
-    <string name="hide_system" msgid="8845453295584638040">"Skjul systemapper"</string>
+    <string name="show_system" msgid="4401355756969485287">"Vis systemet"</string>
+    <string name="hide_system" msgid="8845453295584638040">"Skjul systemet"</string>
     <string name="modify_system_settings_title" msgid="4596320571562433972">"Endre systeminnstillingene"</string>
     <string name="modify_system_settings_description" msgid="5295023124419592452">"Med denne tillatelsen kan apper endre systeminnstillingene."</string>
     <string name="notification_access_title" msgid="1467340098885813473">"Tilgang til varsler"</string>
@@ -344,16 +346,11 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"Nylige posisjonsforespørsler"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"Ingen nylige posisjonsforespørsler"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"Tillatelser på appnivå"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"Søking"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"Posisjonstjenester"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Wi‑Fi-søking"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"La apper og tjenester søke etter Wi-Fi-nettverk når som helst, selv når Wi-Fi er slått av. Dette kan for eksempel brukes til å forbedre posisjonsbaserte funksjoner og tjenester."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"Bluetooth-skanning"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"La apper og tjenester søke etter enheter i nærheten når som helst, selv når Bluetooth er slått av. Dette kan for eksempel brukes til å forbedre posisjonsbaserte funksjoner og tjenester."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"System"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"Systemoppdateringer"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Android-versjon"</string>
-    <string name="security_patch" msgid="4794276590178386903">"Android-sikkerhetsoppdatering"</string>
+    <string name="security_patch" msgid="4794276590178386903">"Nivå av Android-sikkerhetsoppdatering"</string>
     <string name="model_info" msgid="4966408071657934452">"Modell"</string>
     <string name="baseband_version" msgid="2370088062235041897">"Basisbåndversjon"</string>
     <string name="kernel_version" msgid="7327212934187011508">"Kjerneversjon"</string>
@@ -392,7 +389,7 @@
     <string name="reset_options_title" msgid="4388902952861833420">"Alternativer for tilbakestilling"</string>
     <string name="reset_options_summary" msgid="5508201367420359293">"Tilbakestilling av nettverk, apper eller enhet"</string>
     <string name="reset_network_title" msgid="1284233059990797263">"Tilbakestill nettverket"</string>
-    <string name="reset_network_desc" msgid="602381374544634925">"Dette tilbakestiller alle nettverksinnstillingene, blant annet"</string>
+    <string name="reset_network_desc" msgid="602381374544634925">"Dette tilbakestiller alle nettverksinnstillingene, inkludert"</string>
     <string name="reset_network_item_wifi" msgid="7569481589699982698"><li>"Wi‑Fi"</li></string>
     <string name="reset_network_item_mobile" msgid="5747282716664480997"><li>"Mobildata"</li></string>
     <string name="reset_network_item_bluetooth" msgid="6035019931106921284"><li>"Bluetooth"</li></string>
@@ -416,7 +413,7 @@
     <string name="master_clear_button_text" msgid="8010754220392741160">"Tilbakestill kjøretøyet"</string>
     <string name="master_clear_confirm_title" msgid="8646455623132887370">"Vil du tilbakestille?"</string>
     <string name="master_clear_confirm_desc" msgid="8920446291698038558">"Vil du slette den personlige informasjonen din og nedlastede apper? Du kan ikke angre denne handlingen."</string>
-    <string name="master_clear_confirm_button_text" msgid="7981254968588121786">"Tøm alt"</string>
+    <string name="master_clear_confirm_button_text" msgid="7981254968588121786">"Slett alt"</string>
     <string name="master_clear_progress_title" msgid="7087480656932674774">"Tømmer"</string>
     <string name="master_clear_progress_text" msgid="3440789441935303176">"Vent litt."</string>
     <string name="date_and_time_settings_title" msgid="4058492663544475485">"Dato og klokkeslett"</string>
@@ -428,7 +425,7 @@
     <string name="date_time_24hour_title" msgid="3025576547136168692">"24-timers format"</string>
     <string name="date_time_24hour" msgid="1137618702556486913">"Bruk 24-timers format"</string>
     <string name="date_time_set_time_title" msgid="5884883050656937853">"Klokkeslett"</string>
-    <string name="date_time_set_time" msgid="6449555153906058248">"Still klokken"</string>
+    <string name="date_time_set_time" msgid="6449555153906058248">"Angi klokkeslett"</string>
     <string name="date_time_set_timezone_title" msgid="3001779256157093425">"Tidssone"</string>
     <string name="date_time_set_timezone" msgid="4759353576185916944">"Velg tidssone"</string>
     <string name="date_time_set_date_title" msgid="6834785820357051138">"Dato"</string>
@@ -451,7 +448,7 @@
     <string name="uninstall_apps_permission_title" msgid="8448422340567430659">"Avinstaller apper"</string>
     <string name="user_add_user_menu" msgid="5319151436895941496">"Legg til bruker"</string>
     <string name="user_new_user_name" msgid="7115771396412339662">"Ny bruker"</string>
-    <string name="user_add_user_title" msgid="7458813670614932479">"Vil du legge til denne brukeren?"</string>
+    <string name="user_add_user_title" msgid="7458813670614932479">"Vil du legge til en ny bruker?"</string>
     <string name="user_add_user_message_setup" msgid="6030901156040053106">"Når du legger til en ny bruker, må vedkommende konfigurere sitt eget område."</string>
     <string name="user_add_user_message_update" msgid="1528170913388932459">"Alle brukere kan oppdatere apper for alle andre brukere."</string>
     <string name="user_limit_reached_title" msgid="8803355734556061238">"Grensen for antall brukere er nådd"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"Kunne ikke registrere <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"Hvis du legger til en godkjent enhet, må du angi en autentiseringsmetode. Hvis du ikke har den godkjente enheten din med deg, kreves autentisering for å få tilgang til profilen din."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"Enheten er frakoblet."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"Tøm legitimasjonslageret"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"Fjern alle sertifikater"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"Vil du fjerne alt innholdet?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"Legitimasjonslageret er tømt."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"Kunne ikke tømme legitimasjonslageret."</string>
     <string name="forget" msgid="3971143908183848527">"Glem"</string>
     <string name="connect" msgid="5861699594602380150">"Koble til"</string>
     <string name="disconnect" msgid="6140789953324820336">"Koble fra"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Dette sletter demokontoen og tilbakestiller systemet til fabrikkstandard. Alle brukerdataene går tapt."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Avslutt demomodus"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"AVVIS"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"Funksjonen er ikke tilgjengelig når du kjører."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"Du kan ikke legge til en bruker mens du kjører."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"Funksjonen er ikke tilgjengelig når du kjører"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"Du kan ikke legge til en bruker mens du kjører"</string>
 </resources>
diff --git a/res/values-ne/config.xml b/res/values-ne/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-ne/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 6f6f421..e94046a 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"यो प्रयोगकर्ताको लागि स्थापना गरिएको छैन"</string>
     <string name="permissions_label" msgid="2701446753515612685">"अनुमतिहरू"</string>
     <string name="notifications_label" msgid="6586089149665170731">"सूचनाहरू"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"भण्डारण र क्यास"</string>
     <string name="application_version_label" msgid="8556889839783311649">"संस्करण: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"कुनै पनि अनुमति प्रदान गरिएको छैन"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"कुनै पनि अनुमतिका लागि अनुरोध गरिएको छैन"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s इन्चको आन्तरिक भण्डारण"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"डेटाको प्रयोग"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"अनुप्रयोगको डेटाको प्रयोग"</string>
     <string name="computing_size" msgid="5791407621793083965">"गणना गरिँदै…"</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"हालका स्थानसम्बन्धी अनुरोधहरू"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"हालसालैका स्थानसम्बन्धी कुनै पनि अनुरोध छैन"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"अनुप्रयोग स्तरीय अनुमति"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"स्क्यान गर्दै"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"स्थानसम्बन्धी सेवाहरू"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Wi-Fi स्क्यान हुँदै"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"अनुप्रयोग र सेवाहरूलाई जुनसुकै बेला (Wi‑Fi निष्क्रिय भएको बेलामा पनि) वरपरका Wi-Fi नेटवर्कहरू स्क्यान गर्न अनुमति दिनुहोस्। यसलाई स्थानमा आधारित सुविधा तथा सेवाहरू सुधार गर्ने जस्ता कार्यहरू गर्नाका लागि प्रयोग गर्न सकिन्छ।"</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"ब्लुटुथ स्क्यान हुँदै"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"अनुप्रयोग तथा सेवाहरूलाई जुनसुकै बेला (ब्लुटुथ निष्क्रिय भएको बेलामा पनि) वरपरका यन्त्रहरू स्क्यान गर्न अनुमति दिनुहोस्‌। यसलाई स्थानमा आधारित सुविधा तथा सेवाहरू सुधार गर्ने जस्ता कार्यहरू गर्नाका लागि प्रयोग गर्न सकिन्छ।"</string>
     <string name="system_setting_title" msgid="6864599341809463440">"प्रणाली"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"प्रणालीसम्बन्धी अद्यावधिकहरू"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Android संस्करण"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> दर्ता गर्न सकिएन"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"कुनै विश्वसनीय यन्त्र थप्दा तपाईंले यसपछिको चरणमा प्रमाणीकरण विधि सेट गर्नु पर्छ। तपाईंसँग आफ्नो विश्वसनीय यन्त्र छैन भने तपाईंको प्रोफाइलमाथि पहुँच राख्न प्रमाणीकरणको आवश्यकता पर्ने छ।"</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"यन्त्र विच्छेद गरियो।"</string>
+    <string name="credentials_reset" msgid="873900550885788639">"प्रमाणहरू मेट्नुहोस्"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"सबै प्रमाणहरू हटाउनुहोस्"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"सम्पूर्ण सामग्री हटाउने हो?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"प्रमाणको भण्डारण मेटियो।"</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"प्रमाणको भण्डारण मेटाउन सकिएन।"</string>
     <string name="forget" msgid="3971143908183848527">"बिर्सनुहोस्"</string>
     <string name="connect" msgid="5861699594602380150">"जडान गर्नुहोस्"</string>
     <string name="disconnect" msgid="6140789953324820336">"विच्छेद गर्नुहोस्"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"यस कार्यले डेमो खाता मेटाउनुका साथै प्रणालीमा फ्याक्ट्रीको डेटा रिसेट गर्दछ। प्रयोगकर्ताका सबै डेटा गुम्ने छन्।"</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"डेमो मोडबाट बाहिरिनुहोस्"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"खारेज गर्नुहोस्"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"सवारी साधन चलाइरहेको बेला यो सुविधा उपलब्ध छैन।"</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"सवारी साधन चलाइरहेको बेला प्रयोगकर्तालाई थप्न सकिँदैन।"</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"सवारी साधन चलाइरहेका बेला यो सुविधा उपलब्ध छैन"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"सवारी साधन चलाइरहेको बेला प्रयोगकर्तालाई थप्न सकिँदैन"</string>
 </resources>
diff --git a/res/values-nl/config.xml b/res/values-nl/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-nl/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 93303e7..d4a62e6 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"Niet geïnstalleerd voor deze gebruiker"</string>
     <string name="permissions_label" msgid="2701446753515612685">"Rechten"</string>
     <string name="notifications_label" msgid="6586089149665170731">"Meldingen"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"Opslag en cache"</string>
     <string name="application_version_label" msgid="8556889839783311649">"Versie: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"Geen rechten verleend"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"Geen rechten aangevraagd"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s in interne opslag"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"Datagebruik"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"Gegevensgebruik van app"</string>
     <string name="computing_size" msgid="5791407621793083965">"Berekenen…"</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"Recente locatieverzoeken"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"Geen recente locatieverzoeken"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"Rechten op app-niveau"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"Scannen"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"Locatieservices"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Wifi-scannen"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Apps en services toestaan altijd te scannen naar wifi-netwerken in de buurt, zelfs als wifi is uitgeschakeld. Dit kan bijvoorbeeld worden gebruikt om locatiegebaseerde functies en services te verbeteren."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"Bluetooth-scannen"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"Apps en services toestaan altijd te scannen naar apparaten in de buurt, zelfs als Bluetooth is uitgeschakeld. Dit kan bijvoorbeeld worden gebruikt om locatiegebaseerde functies en services te verbeteren."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"Systeem"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"Systeemupdates"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Android-versie"</string>
@@ -452,7 +449,7 @@
     <string name="user_add_user_menu" msgid="5319151436895941496">"Gebruiker toevoegen"</string>
     <string name="user_new_user_name" msgid="7115771396412339662">"Nieuwe gebruiker"</string>
     <string name="user_add_user_title" msgid="7458813670614932479">"Nieuwe gebruiker?"</string>
-    <string name="user_add_user_message_setup" msgid="6030901156040053106">"Wanneer je een nieuwe gebruiker toevoegt, moet die persoon zijn eigen profiel instellen."</string>
+    <string name="user_add_user_message_setup" msgid="6030901156040053106">"Wanneer je een nieuwe gebruiker toevoegt, moet die persoon een eigen profiel instellen."</string>
     <string name="user_add_user_message_update" msgid="1528170913388932459">"Elke gebruiker kan apps updaten voor alle andere gebruikers"</string>
     <string name="user_limit_reached_title" msgid="8803355734556061238">"Gebruikerslimiet bereikt"</string>
     <plurals name="user_limit_reached_message" formatted="false" msgid="2651922256448824747">
@@ -536,7 +533,7 @@
     <string name="security_lock_pattern" msgid="1174352995619563104">"Patroon"</string>
     <string name="security_lock_pin" msgid="4891899974369503200">"Pincode"</string>
     <string name="security_lock_password" msgid="4420203740048322494">"Wachtwoord"</string>
-    <string name="lock_settings_picker_title" msgid="6590330165050361632">"Vergrend.type kiezen"</string>
+    <string name="lock_settings_picker_title" msgid="6590330165050361632">"Vergrendeling kiezen"</string>
     <string name="screen_lock_options" msgid="8531177937577168185">"Vergrendelingsopties"</string>
     <string name="lock_settings_enter_pattern" msgid="4826034565853171624">"Geef je patroon op"</string>
     <string name="lockpattern_confirm_button_text" msgid="7784925958324484965">"Bevestigen"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"Inschrijving van <xliff:g id="DEVICE_NAME">%1$s</xliff:g> mislukt"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"Als je een vertrouwd apparaat toevoegt, moet je daarna een verificatiemethode instellen. Als je je vertrouwde apparaat niet bij je hebt, is verificatie vereist voor toegang tot je profiel."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"Verbinding met apparaat verbroken."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"Certificaatgegevens wissen"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"Alle certificaten verwijderen"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"Alle content verwijderen?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"Opslag certificaatgegevens is gewist."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"Kan opslag certificaatgegevens niet wissen."</string>
     <string name="forget" msgid="3971143908183848527">"Vergeten"</string>
     <string name="connect" msgid="5861699594602380150">"Verbinden"</string>
     <string name="disconnect" msgid="6140789953324820336">"Verbinding verbreken"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Hiermee wordt het demo-account verwijderd en wordt het systeem teruggezet op de fabrieksinstellingen. Alle gebruikersgegevens gaan verloren."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Demo afsluiten"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"SLUITEN"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"Functie niet beschikbaar tijdens het rijden."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"Kan geen gebruikers toevoegen tijdens het rijden."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"Functie niet beschikbaar tijdens het rijden"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"Kan geen gebruikers toevoegen tijdens het rijden"</string>
 </resources>
diff --git a/res/values-or/config.xml b/res/values-or/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-or/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 07d117d..2d3f2b3 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"ଏହି ଉପଯୋଗକର୍ତ୍ତାଙ୍କ ପାଇଁ ଇନ୍‌ଷ୍ଟଲ୍ କରାଯାଇନାହିଁ"</string>
     <string name="permissions_label" msgid="2701446753515612685">"ଅନୁମତିଗୁଡ଼ିକ"</string>
     <string name="notifications_label" msgid="6586089149665170731">"ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"ଷ୍ଟୋରେଜ୍ &amp; କେଚ୍"</string>
     <string name="application_version_label" msgid="8556889839783311649">"ଭର୍ସନ୍‌: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"କୌଣସି ଅନୁମତି ଦିଆଯାଇ ନାହିଁ"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"କୌଣସି ଅନୁମତିର ଅନୁରୋଧ କରାଯାଇ ନାହିଁ"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"ଇଣ୍ଟର୍ନଲ୍ ଷ୍ଟୋରେଜ୍‌ରେ %s ଅଛି"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"ଡାଟାର ବ୍ୟବହାର"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"ଆପ୍‌ ଦ୍ୱାରା ଡାଟା ବ୍ୟବହାର"</string>
     <string name="computing_size" msgid="5791407621793083965">"ଗଣୁଛି…"</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"ସାମ୍ପ୍ରତିକ ଲୋକେସନ୍‌ ଅନୁରୋଧ"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"କୌଣସି ନିକଟର ଲୋକେସନ୍‍ ଅନୁରୋଧ ହୋଇନାହିଁ"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"ଆପ୍‌-ସ୍ତରୀୟ ଅନୁମତି"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"ସ୍କାନିଂ"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"ଲୋକେସନ୍‌ ସମ୍ପର୍କିତ ସେବା"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"ୱାଇ-ଫାଇ ସ୍କାନିଂ"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"ଏପରିକି ୱାଇ-ଫାଇ ଅଫ୍‌ ଥିଲେ ମଧ୍ୟ, ଆପ୍ ଓ ସେବାଗୁଡ଼ିକୁ ଯେକୌଣସି ସମୟରେ ୱାଇ-ଫାଇ ନେଟ୍‌ୱର୍କ ସ୍କାନ୍‍ କରିବାକୁ ଅନୁମତି ଦିଏ। ଏହାକୁ ଲୋକେସନ୍‌ ଆଧାରିତ ଫିଚର୍ ଓ ସେବା ଇତ୍ୟାଦିକୁ ଉନ୍ନତ କରିବା ପାଇଁ ବ୍ୟବହାର କରାଯାଇପାରେ।"</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"ବ୍ଲୁଟୁଥ୍‍ ସ୍କାନିଂ"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"ଏପରିକି ବ୍ଲୁଟୁଥ୍‍‌ ବନ୍ଦ ଥିଲେ ମଧ୍ୟ, ଆପ୍ ଓ ସେବାଗୁଡ଼ିକୁ ଯେକୌଣସି ସମୟରେ ଆଖପାଖରେ ଥିବା ଡିଭାଇସ୍‌ ଖୋଜିବାକୁ ଦିଏ। ଏହାକୁ ଲୋକେସନ୍‌ ଆଧାରିତ ଫିଚର୍ ଓ ସେବା ଇତ୍ୟାଦିକୁ ଉନ୍ନତ କରିବା ପାଇଁ ବ୍ୟବହାର କରାଯାଇପାରେ।"</string>
     <string name="system_setting_title" msgid="6864599341809463440">"ସିଷ୍ଟମ୍‌"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"ସିଷ୍ଟମ୍‌ ଅପ୍‌ଡେଟ୍"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Android ଭର୍ସନ୍‌"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ନାମାଙ୍କନ ହୋଇପାରିଲା ନାହିଁ"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"ଏହାପରେ ଏକ ବିଶ୍ୱସନୀୟ ଡିଭାଇସ୍‌ ଯୋଗ କରିବାରେ ଆପଣଙ୍କୁ ପ୍ରମାଣିକରଣର ଉପାୟ ସେଟ୍‍ କରିବାକୁ ହେବ। ଯଦି ଆପଣଙ୍କ ପାଖରେ ବିଶ୍ୱସନୀୟ ଡିଭାଇସ୍‌ ନାହିଁ, ତେବେ ଆପଣଙ୍କ ପ୍ରୋଫାଇଲ୍‌ ଆକ୍ସେସ୍‌ କରିବାକୁ ପ୍ରମାଣିକରଣ ଆବଶ୍ୟକ ହେବ।"</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"ଡିଭାଇସ୍ ବିଚ୍ଛିନ୍ନ ହୋଇଛି।"</string>
+    <string name="credentials_reset" msgid="873900550885788639">"କ୍ରେଡେନସିଆଲ୍ ଖାଲି କରନ୍ତୁ"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"ସବୁ ସର୍ଟିଫିକେଟ୍‌କୁ କାଢ଼ି ଦିଅନ୍ତୁ"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"ସବୁ କିଛି କାଢ଼ି ଦେବେ?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"କ୍ରେଡେନସିଆଲ୍ ଷ୍ଟୋରେଜ୍‌କୁ ଲିଭାଇ ଦିଆଯାଇଛି।"</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"କ୍ରେଡେନସିଆଲ୍ ଷ୍ଟୋରେଜ୍ ଲିଭା ଯାଇପାରିବ ନାହିଁ।"</string>
     <string name="forget" msgid="3971143908183848527">"ଭୁଲିଗଲେ"</string>
     <string name="connect" msgid="5861699594602380150">"ସଂଯୋଗ କରନ୍ତୁ"</string>
     <string name="disconnect" msgid="6140789953324820336">"ବିଛିନ୍ନ କରନ୍ତୁ"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"ଏହା ଡେମୋ ଆକାଉଣ୍ଟକୁ ଡିଲିଟ୍ କରିଦେବ ଏବଂ ଫ୍ୟାକ୍ଟୋରୀ ଡାଟା ସିଷ୍ଟମ୍‍କୁ ରିସେଟ୍ କରିବ। ସମସ୍ତ ୟୁଜର୍ ଡାଟା ନଷ୍ଟ ହୋ‍ଇଯିବ।"</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"ଡେମୋରୁ ବାହାରିଯା’ନ୍ତୁ"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"ଖାରଜ କରନ୍ତୁ"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"ଗାଡ଼ି ଚଲାଇବାବେଳେ ଫିଚର୍ ଉପଲବ୍ଧ ହେବନାହିଁ।"</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"ଗାଡ଼ି ଚଲାଇବା ବେଳେ ୟୁଜର୍ ଯୋଡ଼ିପାରିବେ ନାହିଁ।"</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"ଗାଡ଼ି ଚଲାଇବା ସମୟରେ ଫିଚର୍ ଉପଲବ୍ଧ ହେବ ନାହିଁ"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"ଗାଡ଼ି ଚଲାଇବା ବେଳେ ଉପଯୋଗକର୍ତ୍ତା ଯୋଗ କରିପାରିବେ ନାହିଁ"</string>
 </resources>
diff --git a/res/values-pa/config.xml b/res/values-pa/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-pa/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index e296e36..51ada4c 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"ਇਸ ਵਰਤੋਂਕਾਰ ਲਈ ਸਥਾਪਤ ਨਹੀਂ ਕੀਤਾ ਗਿਆ"</string>
     <string name="permissions_label" msgid="2701446753515612685">"ਇਜਾਜ਼ਤਾਂ"</string>
     <string name="notifications_label" msgid="6586089149665170731">"ਸੂਚਨਾਵਾਂ"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"ਸਟੋਰੇਜ ਅਤੇ ਕੈਸ਼ੇ"</string>
     <string name="application_version_label" msgid="8556889839783311649">"ਵਰਜਨ: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"ਕੋਈ ਇਜਾਜ਼ਤਾਂ ਨਹੀਂ ਦਿੱਤੀਆਂ ਗਈਆਂ"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"ਕਿਸੇ ਇਜਾਜ਼ਤਾਂ ਦੀ ਬੇਨਤੀ ਨਹੀਂ ਕੀਤੀ ਗਈ"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ ਵਿੱਚ %s"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"ਡਾਟਾ ਵਰਤੋਂ"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"ਐਪ ਡਾਟਾ ਵਰਤੋਂ"</string>
     <string name="computing_size" msgid="5791407621793083965">"ਗਣਨਾ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ…"</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"ਹਾਲੀਆ ਟਿਕਾਣਾ ਬੇਨਤੀਆਂ"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"ਕੋਈ ਹਾਲੀਆ ਟਿਕਾਣਾ ਬੇਨਤੀਆਂ ਨਹੀਂ"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"ਐਪ-ਪੱਧਰ ਇਜਾਜ਼ਤਾਂ"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"ਸਕੈਨ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"ਟਿਕਾਣਾ ਸੇਵਾਵਾਂ"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"ਵਾਈ‑ਫਾਈ ਸਕੈਨਿੰਗ"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"ਵਾਈ-ਫਾਈ ਬੰਦ ਹੋਣ \'ਤੇ ਵੀ ਐਪਾਂ ਅਤੇ ਸੇਵਾਵਾਂ ਨੂੰ ਕਿਸੇ ਵੀ ਵੇਲੇ ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕਾਂ ਲਈ ਸਕੈਨ ਕਰਨ ਦਿਓ। ਇਸਦੀ ਵਰਤੋਂ ਕਰਕੇ ਟਿਕਾਣਾ-ਆਧਾਰਿਤ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਅਤੇ ਸੇਵਾਵਾਂ ਵਰਗੀਆਂ ਚੀਜ਼ਾਂ ਨੂੰ ਬਿਹਤਰ ਬਣਾਇਆ ਜਾ ਸਕਦਾ ਹੈ।"</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"ਬਲੂਟੁੱਥ ਸਕੈਨਿੰਗ"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"ਬਲੂਟੁੱਥ ਬੰਦ ਹੋਣ \'ਤੇ ਵੀ ਐਪਾਂ ਅਤੇ ਸੇਵਾਵਾਂ ਨੂੰ ਕਿਸੇ ਵੀ ਵੇਲੇ ਨਜ਼ਦੀਕੀ ਡੀਵਾਈਸਾਂ ਲਈ ਸਕੈਨ ਕਰਨ ਦਿਓ। ਇਸਦੀ ਵਰਤੋਂ ਕਰਕੇ ਟਿਕਾਣਾ-ਆਧਾਰਿਤ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਅਤੇ ਸੇਵਾਵਾਂ ਵਰਗੀਆਂ ਚੀਜ਼ਾਂ ਨੂੰ ਬਿਹਤਰ ਬਣਾਇਆ ਜਾ ਸਕਦਾ ਹੈ।"</string>
     <string name="system_setting_title" msgid="6864599341809463440">"ਸਿਸਟਮ"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"ਸਿਸਟਮ ਅੱਪਡੇਟ"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Android ਵਰਜਨ"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨੂੰ ਦਰਜ ਕਰਨਾ ਅਸਫਲ ਰਿਹਾ"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"ਭਰੋਸੇਯੋਗ ਡੀਵਾਈਸ ਨੂੰ ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਅੱਗੇ ਤੁਹਾਨੂੰ ਪ੍ਰਮਾਣੀਕਰਨ ਵਿਧੀ ਸੈੱਟ ਕਰਨ ਦੀ ਲੋੜ ਹੋਵੇਗੀ। ਜੇ ਤੁਹਾਡੇ ਕੋਲ ਤੁਹਾਡਾ ਭਰੋਸੇਯੋਗ ਡੀਵਾਈਸ ਨਹੀਂ ਹੈ, ਤਾਂ ਤੁਹਾਨੂੰ ਆਪਣੇ ਪ੍ਰੋਫ਼ਾਈਲ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਲਈ ਪ੍ਰਮਾਣੀਕਰਨ ਦੀ ਲੋੜ ਹੋਵੇਗੀ।"</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"ਡੀਵਾਈਸ ਡਿਸਕਨੈਕਟ ਕੀਤਾ ਗਿਆ।"</string>
+    <string name="credentials_reset" msgid="873900550885788639">"ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ ਕਲੀਅਰ ਕਰੋ"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"ਸਾਰੇ ਪ੍ਰਮਾਣ-ਪੱਤਰ ਹਟਾਓ"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"ਕੀ ਸਾਰੀਆਂ ਸਮੱਗਰੀਆਂ ਹਟਾਉਣੀਆਂ ਹਨ?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ ਸਟੋਰੇਜ ਮਿਟਾਈ ਗਈ।"</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"ਕ੍ਰੈਡੈਂਸ਼ੀਅਲ ਸਟੋਰੇਜ ਨਹੀਂ ਮਿਟਾਈ ਜਾ ਸਕੀ।"</string>
     <string name="forget" msgid="3971143908183848527">"ਛੱਡੋ"</string>
     <string name="connect" msgid="5861699594602380150">"ਕਨੈਕਟ ਕਰੋ"</string>
     <string name="disconnect" msgid="6140789953324820336">"ਡਿਸਕਨੈਕਟ ਕਰੋ"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"ਇਹ ਡੈਮੋ ਖਾਤੇ ਨੂੰ ਮਿਟਾ ਦੇਵੇਗਾ ਅਤੇ ਸਿਸਟਮ ਦਾ ਫੈਕਟਰੀ ਡਾਟਾ ਰੀਸੈੱਟ ਹੋ ਜਾਵੇਗਾ। ਸਾਰਾ ਵਰਤੋਂਕਾਰ ਡਾਟਾ ਗੁੰਮ ਹੋ ਜਾਵੇਗਾ।"</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"ਡੈਮੋ ਮੋਡ ਤੋ ਬਾਹਰ ਜਾਓ"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"ਖਾਰਜ ਕਰੋ"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"ਗੱਡੀ ਚਲਾਉਣ ਵੇਲੇ ਵਿਸ਼ੇਸ਼ਤਾ ਉਪਲਬਧ ਨਹੀਂ ਹੈ।"</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"ਗੱਡੀ ਚਲਾਉਣ ਦੌਰਾਨ ਵਰਤੋਂਕਾਰ ਸ਼ਾਮਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ।"</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"ਚਲਦੀ ਗੱਡੀ ਵਿੱਚ ਇਹ ਵਿਸ਼ੇਸ਼ਤਾ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"ਚਲਦੀ ਗੱਡੀ ਵਿੱਚ ਵਰਤੋਂਕਾਰ ਸ਼ਾਮਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"</string>
 </resources>
diff --git a/res/values-pl/config.xml b/res/values-pl/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-pl/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 276a89f..79ffccd 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -56,9 +56,9 @@
     <string name="data_usage_settings" msgid="7877132994777987848">"Użycie danych"</string>
     <string name="data_usage_title" msgid="2923515974389203812">"Dane podstawowe"</string>
     <string name="data_used_formatted" msgid="6684557577780068339">"Wykorzystano <xliff:g id="ID_1">^1</xliff:g> <xliff:g id="ID_2">^2</xliff:g>"</string>
-    <string name="cell_data_warning" msgid="8997739664336571149">"Próg ostrzegawczy: <xliff:g id="ID_1">^1</xliff:g>"</string>
+    <string name="cell_data_warning" msgid="8997739664336571149">"Ostrzeżenie dotyczące danych: <xliff:g id="ID_1">^1</xliff:g>"</string>
     <string name="cell_data_limit" msgid="6862164869877993009">"Limit danych: <xliff:g id="ID_1">^1</xliff:g>"</string>
-    <string name="cell_data_warning_and_limit" msgid="5003954080814312475">"Próg ostrzegawczy: <xliff:g id="ID_1">^1</xliff:g> / limit danych: <xliff:g id="ID_2">^2</xliff:g>"</string>
+    <string name="cell_data_warning_and_limit" msgid="5003954080814312475">"Ostrzeżenie dotyczące danych: <xliff:g id="ID_1">^1</xliff:g> / limit danych: <xliff:g id="ID_2">^2</xliff:g>"</string>
     <plurals name="billing_cycle_days_left" formatted="false" msgid="9163059632851951402">
       <item quantity="few">%d dni do końca</item>
       <item quantity="many">%d dni do końca</item>
@@ -77,10 +77,10 @@
     <string name="cycle_reset_day_of_month_picker_title" msgid="1374568502823735361">"Data resetowania cyklu transmisji danych"</string>
     <string name="cycle_reset_day_of_month_picker_subtitle" msgid="5361061448258189846">"Data w każdym miesiącu:"</string>
     <string name="cycle_reset_day_of_month_picker_positive_button" msgid="6919858010423269305">"Ustaw"</string>
-    <string name="data_warning_limit_title" msgid="4950868241810828601">"Dane i limit"</string>
+    <string name="data_warning_limit_title" msgid="4950868241810828601">"Ostrzeżenie dotyczące danych i limit"</string>
     <string name="app_usage_cycle" msgid="8445927080245880296">"Cykl użycia danych w aplikacjach"</string>
-    <string name="set_data_warning" msgid="6628236612886588097">"Ustaw próg ostrzegawczy"</string>
-    <string name="data_warning" msgid="116776633806885370">"Ostrzeżenie: użycie danych"</string>
+    <string name="set_data_warning" msgid="6628236612886588097">"Ustaw ostrzeżenie dotyczące danych"</string>
+    <string name="data_warning" msgid="116776633806885370">"Ostrzeżenie dotyczące danych"</string>
     <string name="set_data_limit" msgid="7136539812414500084">"Ustaw limit danych"</string>
     <string name="data_limit" msgid="227338836292511425">"Limit danych"</string>
     <string name="data_usage_limit_dialog_title" msgid="1864716658371721883">"Ograniczanie użycia danych"</string>
@@ -287,9 +287,11 @@
     <string name="not_installed" msgid="4218816013370552746">"Niezainstalowana dla tego użytkownika"</string>
     <string name="permissions_label" msgid="2701446753515612685">"Uprawnienia"</string>
     <string name="notifications_label" msgid="6586089149665170731">"Powiadomienia"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"Miejsce na dane i pamięć podręczna"</string>
     <string name="application_version_label" msgid="8556889839783311649">"Wersja %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"Brak przyznanych uprawnień"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"Brak próśb o przyznanie uprawnień"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s w pamięci wewnętrznej"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"Użycie danych"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"Aplikacja – użycie danych"</string>
     <string name="computing_size" msgid="5791407621793083965">"Przetwarzam…"</string>
@@ -350,12 +352,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"Ostatnie prośby o lokalizację"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"Brak ostatnich próśb o lokalizację"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"Uprawnienia na poziomie aplikacji"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"Skanowanie"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"Usługi lokalizacyjne"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Skanowanie Wi‑Fi"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Zezwól na wyszukiwanie urządzeń w pobliżu przez aplikacje i usługi w dowolnym momencie, nawet gdy Wi-Fi jest wyłączone. Może to np. pomóc usprawnić działanie funkcji i usług opartych na lokalizacji."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"Skanowanie Bluetooth"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"Zezwól na wyszukiwanie urządzeń w pobliżu przez aplikacje i usługi w dowolnym momencie, nawet gdy Bluetooth jest wyłączony. Może to np. pomóc usprawnić działanie funkcji i usług opartych na lokalizacji."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"System"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"Aktualizacje systemu"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Wersja Androida"</string>
@@ -664,6 +661,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"Nie udało się zarejestrować urządzenia <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"Po dodaniu zaufanego urządzenia musisz wybrać metodę uwierzytelniania. Dzięki niej uzyskasz dostęp do swojego profilu, gdy akurat nie będziesz mieć zaufanego urządzenia przy sobie."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"Urządzenie zostało rozłączone."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"Wyczyść dane o certyfikatach"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"Usuń wszystkie certyfikaty"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"Usunąć całą zawartość?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"Wykasowano magazyn danych logowania."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"Nie udało się wykasować magazynu danych logowania."</string>
     <string name="forget" msgid="3971143908183848527">"Zapomnij"</string>
     <string name="connect" msgid="5861699594602380150">"Połącz"</string>
     <string name="disconnect" msgid="6140789953324820336">"Odłącz"</string>
@@ -679,6 +681,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Spowoduje to usunięcie konta demonstracyjnego i przywrócenie danych fabrycznych systemu. Utracisz wszystkie swoje dane użytkownika."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Zamknij tryb demo"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"ZAMKNIJ"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"Funkcja niedostępna podczas jazdy."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"Nie można dodać użytkownika podczas jazdy."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"Funkcja niedostępna podczas jazdy"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"Nie można dodać użytkownika podczas jazdy"</string>
 </resources>
diff --git a/res/values-pt-rPT/config.xml b/res/values-pt-rPT/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-pt-rPT/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index db97256..9593db7 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -200,7 +200,7 @@
     <string name="language_settings" msgid="2079258598337245546">"Idiomas"</string>
     <string name="languages_and_input_settings" msgid="3672322610529408248">"Idiomas e introdução"</string>
     <string name="keyboard_settings" msgid="1959697870618278081">"Teclado"</string>
-    <string name="manage_keyboard" msgid="4045394766282200132">"Efetue a gestão dos teclados"</string>
+    <string name="manage_keyboard" msgid="4045394766282200132">"Gerir teclados"</string>
     <string name="text_to_speech_settings" msgid="811985746199507343">"Saída de síntese de voz"</string>
     <string name="text_to_speech_preferred_engine_settings" msgid="2766782925699132256">"Motor preferido"</string>
     <string name="text_to_speech_current_engine" msgid="8133107484909612597">"Motor atual"</string>
@@ -266,7 +266,7 @@
     <string name="units_unit_name_miles_per_gallon_uk" msgid="7700318800709988481">"Milhas por galão (Reino Unido)"</string>
     <string name="units_unit_name_kilometers_per_liter" msgid="8769902235588571155">"Quilómetros por litro"</string>
     <string name="units_unit_name_liter_per_hundred_kilometers" msgid="4867647387452453552">"Litros por cem quilómetros"</string>
-    <string name="apps_and_notifications_settings" msgid="8704585874333781975">"Aplicações e notificações"</string>
+    <string name="apps_and_notifications_settings" msgid="8704585874333781975">"Apps e notificações"</string>
     <string name="all_applications" msgid="7798210477486822168">"Mostrar todas as aplicações"</string>
     <string name="default_applications" msgid="1558183275638697087">"Aplicações predefinidas"</string>
     <string name="app_permissions" msgid="32799922508313948">"Autorizações da aplicação"</string>
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"Não instalado para este utilizador"</string>
     <string name="permissions_label" msgid="2701446753515612685">"Autorizações"</string>
     <string name="notifications_label" msgid="6586089149665170731">"Notificações"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"Armazenamento e cache"</string>
     <string name="application_version_label" msgid="8556889839783311649">"Versão: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"Nenhuma autorização concedida."</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"Nenhuma autorização solicitada."</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s de memória de armazenamento interno"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"Utilização de dados"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"Utiliz. dados da app"</string>
     <string name="computing_size" msgid="5791407621793083965">"A calcular…"</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"Pedidos de localização recentes"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"Sem pedidos de localização recentes."</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"Autorizações de nível de aplicação"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"Procura"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"Serviços de localização"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Procurar por Wi‑Fi"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Permita que as aplicações e os serviços procurem redes Wi‑Fi em qualquer altura, mesmo quando o Wi-Fi estiver desativado. Isto pode ser utilizado, por exemplo, para melhorar as funcionalidades e os serviços baseados na localização."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"Procurar por Bluetooth"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"Permita que as aplicações e os serviços procurem dispositivos próximos em qualquer altura, mesmo quando o Bluetooth estiver desativado. Isto pode ser utilizado para, p. ex., melhorar as funcionalidades e os serviços baseados na localização."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"Sistema"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"Atualizações do sistema"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Versão do Android"</string>
@@ -405,17 +402,17 @@
     <string name="reset_network_confirm_desc" msgid="7721698076856330212">"Pretende repor todas as definições de rede? Não é possível anular esta ação."</string>
     <string name="reset_network_confirm_button_text" msgid="5246859685069024851">"Repor definições"</string>
     <string name="reset_network_complete_toast" msgid="3804108209431416865">"As definições de rede foram repostas."</string>
-    <string name="reset_app_pref_title" msgid="5855420038951743992">"Repor preferências das aplicações"</string>
-    <string name="reset_app_pref_desc" msgid="579392665146962149">"Esta ação irá repor todas as preferências de:\n\n"<li>"Aplicações desativadas"</li>\n<li>"Notificações de aplicações desativadas"</li>\n<li>"Aplicações predefinidas para ações"</li>\n<li>"Restrições de dados de segundo plano para aplicações"</li>\n<li>"Todas as restrições de autorização"</li>\n\n"Não irá perder quaisquer dados das aplicações."</string>
+    <string name="reset_app_pref_title" msgid="5855420038951743992">"Repor preferências das apps"</string>
+    <string name="reset_app_pref_desc" msgid="579392665146962149">"Esta ação irá repor todas as preferências de:\n\n"<li>"Apps desativadas"</li>\n<li>"Notificações de apps desativadas"</li>\n<li>"Apps predefinidas para ações"</li>\n<li>"Restrições de dados de segundo plano para apps"</li>\n<li>"Todas as restrições de autorização"</li>\n\n"Não irá perder quaisquer dados das apps."</string>
     <string name="reset_app_pref_button_text" msgid="6270820447321231609">"Repor aplicações"</string>
-    <string name="reset_app_pref_complete_toast" msgid="8709072932243594166">"As preferências das aplicações foram repostas."</string>
+    <string name="reset_app_pref_complete_toast" msgid="8709072932243594166">"As preferências das apps foram repostas."</string>
     <string name="master_clear_title" msgid="8515335233363214414">"Apagar todos os dados (repor dados de fábrica)"</string>
     <string name="master_clear_desc" msgid="9058719802779893535">"Esta ação irá apagar todos os dados da unidade principal do veículo, incluindo:\n\n"<li>"A Conta Google"</li>\n<li>"Dados e definições do sistema e da aplicação"</li>\n<li>"Aplicações transferidas"</li></string>
     <string name="master_clear_accounts" msgid="7797522012993567494">"Atualmente, tem sessão iniciada nas seguintes contas:"</string>
     <string name="master_clear_other_users_present" msgid="8383376863095743337">"Existem outros utilizadores presentes neste veículo."</string>
     <string name="master_clear_button_text" msgid="8010754220392741160">"Repor veículo"</string>
     <string name="master_clear_confirm_title" msgid="8646455623132887370">"Pretende repor?"</string>
-    <string name="master_clear_confirm_desc" msgid="8920446291698038558">"Pretende apagar todas as informações pessoais e as aplicações transferidas? Não é possível anular esta ação!"</string>
+    <string name="master_clear_confirm_desc" msgid="8920446291698038558">"Pretende apagar todas as informações pessoais e as apps transferidas? Não é possível anular esta ação!"</string>
     <string name="master_clear_confirm_button_text" msgid="7981254968588121786">"Apagar tudo"</string>
     <string name="master_clear_progress_title" msgid="7087480656932674774">"A apagar…"</string>
     <string name="master_clear_progress_text" msgid="3440789441935303176">"Aguarde…"</string>
@@ -451,7 +448,7 @@
     <string name="uninstall_apps_permission_title" msgid="8448422340567430659">"Desinstalar aplicações"</string>
     <string name="user_add_user_menu" msgid="5319151436895941496">"Adicionar utilizador"</string>
     <string name="user_new_user_name" msgid="7115771396412339662">"Novo utilizador"</string>
-    <string name="user_add_user_title" msgid="7458813670614932479">"Adicion. novo utilizador?"</string>
+    <string name="user_add_user_title" msgid="7458813670614932479">"Pretende adicionar um novo utilizador?"</string>
     <string name="user_add_user_message_setup" msgid="6030901156040053106">"Ao adicionar um novo utilizador, essa pessoa tem de configurar o respetivo espaço."</string>
     <string name="user_add_user_message_update" msgid="1528170913388932459">"Qualquer utilizador pode atualizar aplicações para todos os outros utilizadores."</string>
     <string name="user_limit_reached_title" msgid="8803355734556061238">"Limite de utilizadores alcançado"</string>
@@ -620,9 +617,9 @@
     <string name="lockpassword_pin_no_sequential_digits" msgid="38813552228809240">"Não é permitida uma sequência de dígitos ascendente, descendente ou repetida."</string>
     <string name="setup_lock_settings_options_button_label" msgid="3337845811029780896">"Opções de bloqueio de ecrã"</string>
     <string name="build_info_fmt" msgid="5592554123908086426">"<xliff:g id="FINGERPRINT">%1$s</xliff:g>\n<xliff:g id="DATE">%2$s</xliff:g>: há <xliff:g id="NUM_DAYS">%3$s</xliff:g> dias"</string>
-    <string name="add_device_title" msgid="8452168024017866232">"Adicionar disposit. fidedigno"</string>
+    <string name="add_device_title" msgid="8452168024017866232">"Adicionar dispositivo fidedigno"</string>
     <string name="add_device_summary" msgid="5368217520710573302">"O Bluetooth será ativado p/ adicionar disp. fided."</string>
-    <string name="trusted_device" msgid="5637378361866787603">"Disposit. fidedignos"</string>
+    <string name="trusted_device" msgid="5637378361866787603">"Dispositivos fidedignos"</string>
     <plurals name="trusted_device_subtitle" formatted="false" msgid="462041049834264945">
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> dispositivos</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> dispositivo</item>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"Falha ao inscrever o dispositivo <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"Ao adicionar um dispositivo fidedigno, tem de definir um método de autenticação a seguir. Se não tiver o dispositivo fidedigno consigo, será necessária a autenticação para aceder ao seu perfil."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"Dispositivo desligado."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"Limpar credenciais"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"Permite remover todos os certificados"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"Pretende remover todo o conteúdo?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"O armazenamento de credenciais foi apagado."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"Não foi possível apagar o armazenamento de credenciais."</string>
     <string name="forget" msgid="3971143908183848527">"Esquecer"</string>
     <string name="connect" msgid="5861699594602380150">"Ligar"</string>
     <string name="disconnect" msgid="6140789953324820336">"Desligar"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Esta ação elimina a conta de demonstração e efetua a reposição de dados de fábrica do sistema. Todos os dados do utilizador são perdidos."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Sair da demonstração"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"IGNORAR"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"Funcionalidade não disponível durante a condução."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"Não é possível adicionar o utilizador durante a condução."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"Funcionalidade não disponível durante a condução."</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"Não é possível adicionar o utilizador durante a condução."</string>
 </resources>
diff --git a/res/values-pt/config.xml b/res/values-pt/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-pt/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 5439f17..e4e4451 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"Não instalado para o usuário"</string>
     <string name="permissions_label" msgid="2701446753515612685">"Permissões"</string>
     <string name="notifications_label" msgid="6586089149665170731">"Notificações"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"Armazenamento e cache"</string>
     <string name="application_version_label" msgid="8556889839783311649">"Versão: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"Nenhuma permissão concedida"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"Nenhuma permissão solicitada"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s no armazenamento interno"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"Uso de dados"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"Uso de dados do app"</string>
     <string name="computing_size" msgid="5791407621793083965">"Calculando…"</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"Solicitações recentes"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"Nenhuma solicitação recente de local"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"Permissões no app"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"Verificação"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"Serviços de localização"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Busca por Wi-Fi"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Permitir que apps e serviços procurem redes Wi‑Fi a qualquer momento, mesmo quando o Wi‑Fi estiver desativado. Essa configuração pode ser usada, por exemplo, para melhorar recursos e serviços baseados na localização."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"Verificação de Bluetooth"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"Permitir que apps e serviços procurem dispositivos próximos a qualquer momento, mesmo quando o Bluetooth estiver desativado. Essa configuração pode ser usada, por exemplo, para melhorar recursos e serviços baseados na localização."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"Sistema"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"Atualizações do sistema"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Versão do Android"</string>
@@ -472,7 +469,7 @@
     <string name="choose_new_admin_message" msgid="7468286545352043354">"Você precisa de pelo menos um administrador. Para excluir este, primeiro escolha um substituto."</string>
     <string name="choose_new_admin_label" msgid="5987653639387437939">"Escolher administrador"</string>
     <string name="user_guest" msgid="3465399481257448601">"Convidado"</string>
-    <string name="start_guest_session" msgid="4438752398760283201">"Visitante"</string>
+    <string name="start_guest_session" msgid="4438752398760283201">"Convidado"</string>
     <string name="user_switch" msgid="6544839750534690781">"Alternar"</string>
     <string name="current_user_name" msgid="3813671533249316823">"Você (%1$s)"</string>
     <string name="user_name_label" msgid="3210832645046206845">"Nome"</string>
@@ -622,7 +619,7 @@
     <string name="build_info_fmt" msgid="5592554123908086426">"<xliff:g id="FINGERPRINT">%1$s</xliff:g>\n<xliff:g id="DATE">%2$s</xliff:g> : <xliff:g id="NUM_DAYS">%3$s</xliff:g> dias atrás"</string>
     <string name="add_device_title" msgid="8452168024017866232">"Adicionar disp. confiável"</string>
     <string name="add_device_summary" msgid="5368217520710573302">"Bluetooth será ativ. p/ adicionar disp. confiáveis"</string>
-    <string name="trusted_device" msgid="5637378361866787603">"Disp. confiáveis"</string>
+    <string name="trusted_device" msgid="5637378361866787603">"Dispositivos confiáveis"</string>
     <plurals name="trusted_device_subtitle" formatted="false" msgid="462041049834264945">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> dispositivo</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> dispositivos</item>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"Falha na inscrição do <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"Depois de adicionar um dispositivo confiável, é necessário configurar um método de autenticação. Se o dispositivo confiável não estiver com você, a autenticação será necessária para acessar seu perfil."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"Dispositivo desconectado."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"Limpar credenciais"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"Remover todos os certificados"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"Remover todo o conteúdo?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"Armazenamento de credenciais apagado."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"Armazenamento de credenciais não apagado."</string>
     <string name="forget" msgid="3971143908183848527">"Ignorar"</string>
     <string name="connect" msgid="5861699594602380150">"Conectar"</string>
     <string name="disconnect" msgid="6140789953324820336">"Desconectar"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Isso excluirá a conta de demonstração e redefinirá o sistema para a configuração original. Todos os dados do usuário serão perdidos."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Sair da demonstração"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"DISPENSAR"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"Recurso não disponível enquanto você dirige."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"Não é possível adicionar usuários enquanto você dirige."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"Recurso não disponível enquanto você dirige"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"Não é possível adicionar usuários enquanto você dirige"</string>
 </resources>
diff --git a/res/values-ro/config.xml b/res/values-ro/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-ro/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index c81b484..3319782 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -128,7 +128,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="4707181386646531890">"Adrese IPv6"</string>
     <string name="wifi_gateway" msgid="4975799192860431013">"Gateway"</string>
     <string name="wifi_preferences_title" msgid="772788844257225510">"Preferințe Wi-Fi"</string>
-    <string name="wifi_wakeup" msgid="7451825226044542000">"Activați automat Wi-Fi"</string>
+    <string name="wifi_wakeup" msgid="7451825226044542000">"Activează automat Wi-Fi"</string>
     <string name="wifi_wakeup_summary" msgid="7237521683331291414">"Wi-Fi se va reactiva lângă rețelele calitate înaltă salvate, cum ar fi cea de domiciliu"</string>
     <string name="wifi_wakeup_summary_no_location" msgid="2821576525488435259">"Indisponibil, deoarece locația este dezactivată. Activați "<annotation id="link">"Locația"</annotation>"."</string>
     <string name="wifi_settings_scanning_required_title" msgid="2726782203331704928">"Activați căutarea de rețele Wi-Fi?"</string>
@@ -285,9 +285,11 @@
     <string name="not_installed" msgid="4218816013370552746">"Nu este instalată pentru acest utilizator"</string>
     <string name="permissions_label" msgid="2701446753515612685">"Permisiuni"</string>
     <string name="notifications_label" msgid="6586089149665170731">"Notificări"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"Spațiul de stocare și memoria cache"</string>
     <string name="application_version_label" msgid="8556889839783311649">"Versiunea: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"Nicio permisiune acordată"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"Nicio permisiune solicitată"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s în memoria internă"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"Utilizarea datelor"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"Utilizare date aplicație"</string>
     <string name="computing_size" msgid="5791407621793083965">"Se calculează…"</string>
@@ -347,12 +349,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"Solicitări recente privind locația"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"Nu există solicitări recente privind locația"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"Permisiuni la nivel de aplicație"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"Căutare"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"Servicii de localizare"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Căutare Wi-Fi"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Permiteți aplicațiilor și serviciilor să caute permanent rețele Wi-Fi, chiar și atunci când setarea Wi-Fi este dezactivată. Această permisiune poate fi folosită, de exemplu, pentru a îmbunătăți funcțiile și serviciile bazate pe locație."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"Căutare Bluetooth"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"Permiteți aplicațiilor și serviciilor să caute permanent dispozitive din apropiere, chiar dacă setarea Bluetooth este dezactivată. Această opțiune poate fi folosită, de exemplu, pentru a îmbunătăți funcțiile și serviciile bazate pe locație."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"Sistem"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"Actualizări de sistem"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Versiunea Android"</string>
@@ -652,6 +649,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"Înscrierea dispozitivului <xliff:g id="DEVICE_NAME">%1$s</xliff:g> a eșuat"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"Dacă adăugați un dispozitiv de încredere, trebuie să setați apoi o metodă de autentificare. Dacă nu aveți dispozitivul de încredere cu dvs., va fi necesar să vă autentificați pentru a vă accesa profilul."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"Dispozitivul a fost deconectat."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"Ștergeți datele de conectare"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"Eliminați toate certificatele"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"Eliminați întregul conținut?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"Spațiul de stocare a certificatelor este șters."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"Spațiul de stocare a certificatelor nu a putut fi șters."</string>
     <string name="forget" msgid="3971143908183848527">"Eliminați"</string>
     <string name="connect" msgid="5861699594602380150">"Conectați"</string>
     <string name="disconnect" msgid="6140789953324820336">"Deconectați"</string>
@@ -667,6 +669,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Această acțiune va șterge contul demonstrativ, iar sistemul va reveni la setările din fabrică. Toate datele utilizatorului se vor pierde."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Închideți demonstrația"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"RESPINGEȚI"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"Funcția nu este disponibilă când conduceți."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"Nu puteți adăuga un utilizator în timp ce conduceți."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"Funcția nu este disponibilă când conduceți"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"Nu puteți adăuga un utilizator în timp ce conduceți"</string>
 </resources>
diff --git a/res/values-ru/config.xml b/res/values-ru/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-ru/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 83a7902..92ea6e3 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -157,7 +157,7 @@
     <string name="wifi_ap_band_select_one" msgid="615578175244067396">"Диапазон частот для точек доступа Wi-Fi."</string>
     <string name="tether_settings_title_all" msgid="4663704772599383169">"Точка доступа и режим модема"</string>
     <string name="wifi_hotspot_auto_off_title" msgid="7871858619924599922">"Автоматически выключать точку доступа"</string>
-    <string name="wifi_hotspot_auto_off_summary" msgid="4830341947541735136">"Выключать точку доступа Wi‑Fi автоматически, если к ней не подключено ни одного устройства."</string>
+    <string name="wifi_hotspot_auto_off_summary" msgid="4830341947541735136">"Выключать точку доступа Wi‑Fi, если к ней не подключено ни одного устройства"</string>
     <string name="wifi_ask_enable" msgid="4452418245680754578">"<xliff:g id="REQUESTER">%s</xliff:g> запрашивает включение Wi-Fi"</string>
     <string name="wifi_ask_disable" msgid="2949290055916181553">"<xliff:g id="REQUESTER">%s</xliff:g> запрашивает отключение Wi-Fi"</string>
     <string name="wifi_error" msgid="3105105447117289410">"Ошибка"</string>
@@ -169,7 +169,7 @@
     <string name="bluetooth_disconnect_title" msgid="7675271355910637528">"Отключить устройство?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="2017519733701757244">"Автомобиль будет отключен от устройства \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
     <string name="bluetooth_vehicle_mac_address" msgid="7069234636525805937">"Адрес Bluetooth для автомобиля: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
-    <string name="bluetooth_device_mac_address" msgid="3949829271575045069">"Адрес Bluetooth для устройства: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
+    <string name="bluetooth_device_mac_address" msgid="3949829271575045069">"Адрес Bluetooth: <xliff:g id="ADDRESS">%1$s</xliff:g>"</string>
     <string name="bluetooth_name" msgid="2609869978821094114">"Название автомобиля"</string>
     <string name="bluetooth_rename_vehicle" msgid="5769424875066563154">"Переименование автомобиля"</string>
     <string name="bluetooth_rename_device" msgid="8406868875363878712">"Переименование устройства"</string>
@@ -192,14 +192,14 @@
     <string name="bluetooth_pairing_key_msg" msgid="5066825929751599037">"Код подключения через Bluetooth"</string>
     <string name="bluetooth_enable_alphanumeric_pin" msgid="1636575922217263060">"PIN-код содержит буквы или символы"</string>
     <string name="bluetooth_enter_passkey_msg" msgid="5955236916732265593">"Введите код подключения и нажмите клавишу ввода"</string>
-    <string name="bluetooth_pairing_request" msgid="4769675459526556801">"Установить соединение с устройством <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
+    <string name="bluetooth_pairing_request" msgid="4769675459526556801">"Подключить устройство \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="2015966932886300630">"Разрешить устройству <xliff:g id="DEVICE_NAME">%1$s</xliff:g> доступ к списку контактов и журналу звонков"</string>
     <string name="bluetooth_enter_pin_other_device" msgid="7825091249522704764">"Возможно, потребуется ввести PIN-код на другом устройстве."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="7147248221018865922">"Возможно, потребуется ввести ключ доступа на другом устройстве."</string>
     <string name="bluetooth_pin_values_hint_16_digits" msgid="418776900816984778">"Должно быть 16 цифр"</string>
     <string name="bluetooth_pin_values_hint" msgid="1561325817559141687">"Обычно 0000 или 1234"</string>
     <string name="bluetooth_notif_title" msgid="8374602799367803335">"Запрос на подключение"</string>
-    <string name="bluetooth_notif_message" msgid="1060821000510108726">"Нажмите, чтобы установить соединение с устройством \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
+    <string name="bluetooth_notif_message" msgid="1060821000510108726">"Нажмите, чтобы подключить устройство \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
     <string name="bluetooth_device_picker" msgid="673238198452345475">"Выбор устройства Bluetooth"</string>
     <string name="language_settings" msgid="2079258598337245546">"Языки"</string>
     <string name="languages_and_input_settings" msgid="3672322610529408248">"Язык и ввод"</string>
@@ -287,9 +287,11 @@
     <string name="not_installed" msgid="4218816013370552746">"Не установлено для этого пользователя"</string>
     <string name="permissions_label" msgid="2701446753515612685">"Разрешения"</string>
     <string name="notifications_label" msgid="6586089149665170731">"Уведомления"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"Хранилище и кеш"</string>
     <string name="application_version_label" msgid="8556889839783311649">"Версия: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"У приложения нет разрешений"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"Приложение не запрашивало разрешения"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s: внутренняя память"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"Передача данных"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"Трафик приложения"</string>
     <string name="computing_size" msgid="5791407621793083965">"Вычисление…"</string>
@@ -329,7 +331,7 @@
     <string name="app_link_open_never" msgid="2173174327831792316">"Не открывать в этом приложении"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="7345116365785981158">"Поддерживаемые ссылки"</string>
     <string name="special_access" msgid="5730278220917123811">"Специальный доступ для приложений"</string>
-    <string name="show_system" msgid="4401355756969485287">"Показать системные процессы"</string>
+    <string name="show_system" msgid="4401355756969485287">"Показать сист. процессы"</string>
     <string name="hide_system" msgid="8845453295584638040">"Скрыть системные процессы"</string>
     <string name="modify_system_settings_title" msgid="4596320571562433972">"Изменение системных настроек"</string>
     <string name="modify_system_settings_description" msgid="5295023124419592452">"Приложение сможет изменять системные настройки."</string>
@@ -350,12 +352,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"Последние запросы местоположения"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"Нет недавних запросов местоположения."</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"Разрешения для приложений"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"Поиск"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"Геолокация"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Поиск сетей Wi‑Fi"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Разрешите приложениям и сервисам искать беспроводные сети, даже когда Wi-Fi отключен. Таким образом можно улучшить работу функций и сервисов, использующих данные о местоположении."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"Поиск устройств Bluetooth"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"Разрешите приложениям и сервисам искать сигналы устройств, расположенных поблизости, даже если Bluetooth отключен. Таким образом можно улучшить работу функций и сервисов, использующих данные о местоположении."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"Система"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"Обновления системы"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Версия Android"</string>
@@ -416,7 +413,7 @@
     <string name="reset_app_pref_title" msgid="5855420038951743992">"Сбросить настройки приложений"</string>
     <string name="reset_app_pref_desc" msgid="579392665146962149">"Будут сброшены следующие настройки:\n\n"<li>"Отключенные приложения."</li>\n<li>"Отключенные уведомления приложений."</li>\n<li>"Приложения по умолчанию."</li>\n<li>"Ограничения на передачу данных в фоновом режиме."</li>\n<li>"Все ограничения разрешений."</li>\n\n"Данные приложений удалены не будут."</string>
     <string name="reset_app_pref_button_text" msgid="6270820447321231609">"Сбросить настройки"</string>
-    <string name="reset_app_pref_complete_toast" msgid="8709072932243594166">"Настройки приложений сброшены"</string>
+    <string name="reset_app_pref_complete_toast" msgid="8709072932243594166">"Настройки приложений сброшены."</string>
     <string name="master_clear_title" msgid="8515335233363214414">"Удалить все данные (сбросить настройки)"</string>
     <string name="master_clear_desc" msgid="9058719802779893535">"Будут удалены все данные из головного устройства автомобиля, в том числе:\n\n"<li>"ваш аккаунт Google;"</li>\n<li>"настройки/данные системы и приложений;"</li>\n<li>"установленные приложения."</li></string>
     <string name="master_clear_accounts" msgid="7797522012993567494">"Вы вошли в следующие аккаунты:"</string>
@@ -434,7 +431,7 @@
     <string name="zone_auto" msgid="3701878581920206160">"Автонастройка часового пояса"</string>
     <string name="zone_auto_summary" msgid="4345856882906981864">"Использовать часовой пояс сети"</string>
     <string name="date_time_24hour_title" msgid="3025576547136168692">"24-часовой формат"</string>
-    <string name="date_time_24hour" msgid="1137618702556486913">"Использовать 24-часовой формат"</string>
+    <string name="date_time_24hour" msgid="1137618702556486913">"24-часовой формат"</string>
     <string name="date_time_set_time_title" msgid="5884883050656937853">"Время"</string>
     <string name="date_time_set_time" msgid="6449555153906058248">"Установить время"</string>
     <string name="date_time_set_timezone_title" msgid="3001779256157093425">"Часовой пояс"</string>
@@ -457,7 +454,7 @@
     <string name="sms_messaging_permission_title" msgid="6099328509729071243">"SMS по мобильному Интернету в авто"</string>
     <string name="install_apps_permission_title" msgid="3099705360827925296">"Установка новых приложений"</string>
     <string name="uninstall_apps_permission_title" msgid="8448422340567430659">"Удаление приложений"</string>
-    <string name="user_add_user_menu" msgid="5319151436895941496">"Добавление пользователя"</string>
+    <string name="user_add_user_menu" msgid="5319151436895941496">"Добавить пользователя"</string>
     <string name="user_new_user_name" msgid="7115771396412339662">"Новый пользователь"</string>
     <string name="user_add_user_title" msgid="7458813670614932479">"Добавить пользователя?"</string>
     <string name="user_add_user_message_setup" msgid="6030901156040053106">"Когда вы добавите пользователя, ему потребуется настроить профиль."</string>
@@ -664,6 +661,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"Не удалось зарегистрировать устройство \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"Чтобы добавить надежное устройство, необходимо выбрать способ аутентификации. Если надежного устройства не будет под рукой, вы сможете получить доступ к своему профилю только после аутентификации."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"Устройство отключено."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"Очистить учетные данные"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"Удалить все сертификаты"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"Удалить все содержимое?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"Хранилище учетных данных очищено."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"Не удалось очистить хранилище."</string>
     <string name="forget" msgid="3971143908183848527">"Удалить"</string>
     <string name="connect" msgid="5861699594602380150">"Подключить"</string>
     <string name="disconnect" msgid="6140789953324820336">"Отключить"</string>
@@ -679,6 +681,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Произойдет сброс настроек. Тестовый аккаунт и все пользовательские данные будут удалены."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Выйти из деморежима"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"ЗАКРЫТЬ"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"Эта функция недоступна во время вождения."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"Невозможно добавить пользователя во время вождения."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"Эта функция недоступна во время вождения."</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"Невозможно добавить пользователя во время вождения."</string>
 </resources>
diff --git a/res/values-si/config.xml b/res/values-si/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-si/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 5177c96..75aab6f 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"මෙම පරිශීලකයා සඳහා ස්ථාපනය කර නොමැත"</string>
     <string name="permissions_label" msgid="2701446753515612685">"අවසර"</string>
     <string name="notifications_label" msgid="6586089149665170731">"දැනුම්දීම්"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"ආචයනය සහ කෑෂය"</string>
     <string name="application_version_label" msgid="8556889839783311649">"අනුවාදය: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"අවසර ලබා දී නැත"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"අවසර ඉල්ලා නැත"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"අභ්‍යන්තර ආචයනයේ %s"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"දත්ත භාවිතය"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"යෙදුම් දත්ත භාවිතය"</string>
     <string name="computing_size" msgid="5791407621793083965">"ගණනය කරමින්…"</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"මෑත ස්ථාන ඉල්ලීම්"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"මෑත ස්ථාන ඉල්ලීම් නැත"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"යෙදුම්-මට්ටමේ අවසර"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"ස්කෑන් කිරීම"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"ස්ථානීය සේවා"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Wi-Fi ස්කෑන් කිරීම"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Wi‑Fi ක්‍රියාවිරහිත විට පවා, ඕනෑම වේලාවක දී Wi‑Fi ජාල සඳහා ස්කෑන් කිරීමට යෙදුම් සහ සේවාවන්ට ඉඩ දෙන්න. උදාහරණයක් ලෙස, ස්ථානය-පදනම් වූ විශේෂාංග සහ සේවා වැඩි දියුණු කිරීම සඳහා මෙය භාවිතා කළ හැකිය."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"බ්ලූටූත් ස්කෑන් කිරීම"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"බ්ලූටූත් ක්‍රියාවිරහිත විට පවා, ඕනෑම වේලාවක දී අවට උපාංග සඳහා ස්කෑන් කිරීමට යෙදුම් සහ සේවාවන්ට ඉඩ දෙන්න. උදාහරණයක් ලෙස, ස්ථානය-පදනම් වූ විශේෂාංග සහ සේවා වැඩි දියුණු කිරීම සඳහා මෙය භාවිතා කළ හැකිය."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"පද්ධතිය"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"පද්ධති යාවත්කාලීන"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Android අනුවාදය"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ලියාපදිංචි වීම අසාර්ථකයි"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"විශ්වාසදායී උපාංගයක් එක් කිරීමට ඔබට මීළඟට සත්‍යාපන ක්‍රමයක් සැකසීමට අවශ්‍ය කරයි. ඔබට ඔබේ විශ්වාසදායී උපාංගය ළඟ නොමැති නම්, ඔබේ පැතිකඩට ප්‍රවේශයට සත්‍යාපනය අවශ්‍ය වනු ඇත."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"උපාංගය විසන්ධි වී ඇත."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"අක්තපත්‍ර හිස් කරන්න"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"සියලුම සහතික ඉවත් කරන්න"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"සියලු අන්තර්ගත ඉවත් කරන්න ද?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"අක්තපත්‍ර ආචයනය මැකිණි."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"අක්තපත්‍ර ආචයනය මැකීමට නොහැකි විය."</string>
     <string name="forget" msgid="3971143908183848527">"අමතක කරන්න"</string>
     <string name="connect" msgid="5861699594602380150">"සබඳින්න"</string>
     <string name="disconnect" msgid="6140789953324820336">"විසන්ධි කරන්න"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"මෙමගින් ආදර්ශන ගිණුම මකා පද්ධතිය කර්මාන්තශාලා දත්ත යළි පිහිටුවීම කරනු ඇත. සියලු පරිශීලක දත්ත අහිමි වනු ඇත."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"ආදර්ශනයෙන් ඉවත් වන්න"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"අස් කරන්න"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"විශේෂාංගය රිය පැදවීමේ දී නොමැත."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"රිය පැදවීමේ දී පරිශීලකයා එක් කළ නොහැක."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"රිය පදවන අතරේ විශේෂාංගය නොමැත"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"රිය පදවන අතරේ පරිශීලකයා එක් කළ නොහැක"</string>
 </resources>
diff --git a/res/values-sk/config.xml b/res/values-sk/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-sk/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 8aedb3a..cf95a09 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -287,9 +287,11 @@
     <string name="not_installed" msgid="4218816013370552746">"Pre tohto používateľa nebola nainštalovaná"</string>
     <string name="permissions_label" msgid="2701446753515612685">"Povolenia"</string>
     <string name="notifications_label" msgid="6586089149665170731">"Upozornenia"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"Úložisko a vyrovnávacia pamäť"</string>
     <string name="application_version_label" msgid="8556889839783311649">"Verzia: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"Neboli udelené žiadne povolenia"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"Neboli požadované žiadne povolenia"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s v internom úložisku"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"Spotreba dát"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"Spotreba dát aplikácie"</string>
     <string name="computing_size" msgid="5791407621793083965">"Prebieha výpočet…"</string>
@@ -350,12 +352,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"Nedávne žiadosti o polohu"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"Žiadne nedávne žiadosti o polohu"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"Povolenia na úrovni aplikácie"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"Vyhľadávanie"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"Služby určovania polohy"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Vyhľadávanie sietí Wi‑Fi"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Povoľte aplikáciám a službám kedykoľvek vyhľadávať siete Wi‑Fi, a to aj vtedy, keď je sieť Wi-Fi vypnutá. Môžete to využiť napríklad na zlepšenie funkcií a služieb podmienených polohou."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"Vyhľadávanie zariadení Bluetooth"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"Povoľte aplikáciám a službám kedykoľvek vyhľadávať zariadenia v okolí, a to aj vtedy, keď je rozhranie Bluetooth vypnuté. Môžete to využiť napríklad na zlepšenie funkcií a služieb podmienených polohou."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"Systém"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"Aktualizácie systému"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Verzia Androidu"</string>
@@ -525,7 +522,7 @@
     <string name="user_cannot_add_accounts_message" msgid="6775605884544906797">"Profily s obmedzeniami nemôžu pridávať účty"</string>
     <string name="remove_account_title" msgid="8840386525787836381">"Odstrániť účet"</string>
     <string name="really_remove_account_title" msgid="3555164432587924900">"Chcete odstrániť účet?"</string>
-    <string name="really_remove_account_message" msgid="4296769280849579900">"Odstránením tohto účtu budú zo zariadenia odstránené aj všetky správy, kontakty a ďalšie dáta."</string>
+    <string name="really_remove_account_message" msgid="4296769280849579900">"Odstránením účtu odstránite zo zariadenia aj všetky správy, kontakty a ďalšie údaje tohto účtu."</string>
     <string name="remove_account_error_title" msgid="8368044943174826635">"Účet sa nepodarilo odstrániť."</string>
     <string name="account_sync_title" msgid="6541844336300236915">"Synchronizácia účtu"</string>
     <string name="account_sync_summary_some_on" msgid="4525960296068027182">"Synchronizácia je zapnutá pre <xliff:g id="ID_1">%1$d</xliff:g> z <xliff:g id="ID_2">%2$d</xliff:g> položiek"</string>
@@ -664,6 +661,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sa nepodarilo zaregistrovať"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"Ak chcete pridať dôveryhodné zariadenie, musíte v ďalšom kroku nastaviť spôsob overenia. Ak nemáte dôveryhodné zariadenie pri sebe, prístup do vášho profilu bude možný až po overení."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"Zariadenie bolo odpojené."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"Vymazanie poverení"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"Odstrániť všetky certifikáty"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"Chcete odstrániť všetok obsah?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"Úložisko poverení bolo vymazané."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"Úložisko poverení nie je možné vymazať."</string>
     <string name="forget" msgid="3971143908183848527">"Odstrániť"</string>
     <string name="connect" msgid="5861699594602380150">"Pripojiť"</string>
     <string name="disconnect" msgid="6140789953324820336">"Odpojiť"</string>
@@ -679,6 +681,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Ukážkový účet bude odstránený a systém sa obnoví do výrobných nastavení. Všetky dáta používateľa budú stratené."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Ukončiť ukážku"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"ODMIETNUŤ"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"Funkcia nie je k dispozícii za jazdy."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"Za jazdy nie je možné pridať používateľa."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"Funkcia nie je k dispozícii počas jazdy"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"Za jazdy nie je možné pridať používateľa"</string>
 </resources>
diff --git a/res/values-sl/config.xml b/res/values-sl/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-sl/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index ffa0ca9..8e376e6 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -287,9 +287,11 @@
     <string name="not_installed" msgid="4218816013370552746">"Ni nameščeno za tega uporabnika"</string>
     <string name="permissions_label" msgid="2701446753515612685">"Dovoljenja"</string>
     <string name="notifications_label" msgid="6586089149665170731">"Obvestila"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"Shramba in predpomnilnik"</string>
     <string name="application_version_label" msgid="8556889839783311649">"Različica: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"Ni odobrenih dovoljenj"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"Ni zahtevanih dovoljenj"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s v notranji shrambi"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"Prenes. količina podatkov"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"Pren. kol. podat. aplik."</string>
     <string name="computing_size" msgid="5791407621793083965">"Izračunavanje …"</string>
@@ -350,12 +352,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"Nedavne zahteve za lokacijo"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"Ni nedavnih zahtev za lokacijo"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"Dovoljenja na ravni aplikacije"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"Iskanje"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"Lokacijske storitve"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Iskanje omrežij Wi‑Fi"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Aplikacijam in storitvam omogoči, da kadar koli iščejo omrežja Wi-Fi v bližini, tudi ko je Wi-Fi izklopljen. To funkcijo lahko na primer uporabite, če želite izboljšati funkcije in storitve, ki pri delovanju uporabljajo lokacijo."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"Iskanje naprav Bluetooth"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"Aplikacijam in storitvam omogoči, da kadar koli iščejo naprave v bližini, tudi ko je Bluetooth izklopljen. To funkcijo lahko na primer uporabite, če želite izboljšati funkcije in storitve, ki pri delovanju uporabljajo lokacijo."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"Sistem"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"Posodobitve sistema"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Različica Androida"</string>
@@ -664,6 +661,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"Včlanitev naprave <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ni uspela"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"Če želite dodati zaupanja vredno napravo, morate nato nastaviti način za preverjanje pristnosti. Če zaupanja vredne naprave nimate pri sebi, boste morali preveriti pristnost, če boste želeli dostopati do profila."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"Naprava je odklopljena."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"Brisanje poverilnic"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"Odstranitev vseh potrdil"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"Želite odstraniti vso vsebino?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"Shramba poverilnic je izbrisana."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"Shrambe poverilnic ni bilo mogoče izbrisati."</string>
     <string name="forget" msgid="3971143908183848527">"Pozabi"</string>
     <string name="connect" msgid="5861699594602380150">"Poveži"</string>
     <string name="disconnect" msgid="6140789953324820336">"Prekini povezavo"</string>
@@ -679,6 +681,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"S tem izbrišete predstavitveni račun in ponastavite sistem na tovarniške nastavitve. Vsi uporabniški podatki bodo izgubljeni."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Zapri predstavitev"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"OPUSTI"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"Funkcija med vožnjo ni na voljo."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"Med vožnjo ni mogoče dodati uporabnika."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"Funkcija med vožnjo ni na voljo"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"Med vožnjo ni mogoče dodati uporabnika"</string>
 </resources>
diff --git a/res/values-sq/config.xml b/res/values-sq/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-sq/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index f1406a1..093a1e6 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"Nuk është i instaluar për këtë përdorues"</string>
     <string name="permissions_label" msgid="2701446753515612685">"Lejet"</string>
     <string name="notifications_label" msgid="6586089149665170731">"Njoftime"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"Hapësira ruajtëse dhe memoria specifike"</string>
     <string name="application_version_label" msgid="8556889839783311649">"Versioni: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"Nuk është dhënë leje"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"Nuk është kërkuar leje"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s në hapësirën e brendshme të ruajtjes"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"Përdorimi i të dhënave"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"Përdorimi i të dhënave"</string>
     <string name="computing_size" msgid="5791407621793083965">"Po llogarit…"</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"Kërkesat e vendndodhjeve të fundit"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"Nuk ka kërkesa të vendndodhjeve të fundit"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"Autorizimet në nivel aplikacioni"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"Skanimi"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"Shërbimet e vendndodhjes"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Skanimi i Wi-Fi"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Lejo që aplikacionet dhe shërbimet të skanojnë për rrjete Wi-Fi në çdo moment, edhe kur Wi-Fi është joaktiv. Kjo mund të përdoret, për shembull, për të përmirësuar funksionet dhe shërbimet e bazuara te vendndodhja."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"Skanimi i Bluetooth-it"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"Lejo që aplikacionet dhe shërbimet të skanojnë për pajisje në afërsi në çdo moment, edhe kur Bluetooth është joaktiv. Kjo mund të përdoret, për shembull, për të përmirësuar funksionet dhe shërbimet e bazuara te vendndodhja."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"Sistemi"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"Përditësimet e sistemit"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Versioni i Android-it"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"Regjistrimi i <xliff:g id="DEVICE_NAME">%1$s</xliff:g> dështoi"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"Shtimi i një pajisjeje të besuar kërkon që të caktosh më pas një metodë vërtetimi. Nëse nuk e ke pajisjen e besuar me vete, do të kërkohet vërtetim për të pasur qasje te profili yt."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"Pajisja u shkëput"</string>
+    <string name="credentials_reset" msgid="873900550885788639">"Pastro kredencialet"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"Hiqi të gjitha certifikatat"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"Të hiqen të gjitha përmbajtjet?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"Hapësira ruajtëse e kredencialeve është spastruar."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"Ruajtja e kredencialeve s\'mund të pastrohej."</string>
     <string name="forget" msgid="3971143908183848527">"Harro"</string>
     <string name="connect" msgid="5861699594602380150">"Lidh"</string>
     <string name="disconnect" msgid="6140789953324820336">"Shkëput"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Kjo do të fshijë llogarinë e demonstrimit dhe sistemi do të rivendoset në të dhënat e fabrikës. Të gjitha të dhënat e përdoruesit do të humbasin."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Dil nga demonstrimi"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"HIQ"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"Funksioni nuk ofrohet gjatë drejtimit të makinës."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"Përdoruesi nuk mund të shtohet gjatë drejtimit të makinës"</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"Veçoria nuk ofrohet gjatë drejtimit të makinës"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"Përdoruesi nuk mund të shtohet gjatë drejtimit të makinës"</string>
 </resources>
diff --git a/res/values-sr/config.xml b/res/values-sr/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-sr/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 865c6b1..5a3e6b4 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -285,9 +285,11 @@
     <string name="not_installed" msgid="4218816013370552746">"Није инсталирано за овог корисника"</string>
     <string name="permissions_label" msgid="2701446753515612685">"Дозволе"</string>
     <string name="notifications_label" msgid="6586089149665170731">"Обавештења"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"Меморијски простор и кеш"</string>
     <string name="application_version_label" msgid="8556889839783311649">"Верзија: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"Ниједна дозвола није одобрена"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"Ниједна дозвола није захтевана"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s у интерној меморији"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"Потрошња података"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"Потрошња података апл."</string>
     <string name="computing_size" msgid="5791407621793083965">"Израчунава се..."</string>
@@ -347,12 +349,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"Недавни захтеви за локацију"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"Нема недавних захтева за локацију"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"Дозволе на нивоу апликација"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"Скенирање"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"Услуге локације"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Wi‑Fi скенирање"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Дозволите апликацијама и услугама да траже Wi‑Fi мреже у било ком тренутку, чак и када је Wi‑Fi искључен. Ово може да се користи, на пример, за побољшање функција и услуга заснованих на локацији."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"Bluetooth скенирање"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"Дозволите апликацијама и услугама да траже уређаје у близини у сваком тренутку, чак и када је Bluetooth искључен. Ово може да се користи, на пример, за побољшање функција и услуга заснованих на локацији."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"Систем"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"Ажурирања система"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Верзија Android-а"</string>
@@ -652,6 +649,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"Регистрација уређаја <xliff:g id="DEVICE_NAME">%1$s</xliff:g> није успела"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"За додавање поузданог уређаја следеће што треба да урадите је да подесите метод потврде идентитета. Ако немате поуздани уређај са собом, потврда идентитета ће бити потребна да бисте приступили профилу."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"Прекинута је веза са уређајем."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"Обриши акредитиве"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"Уклoните све сертификате"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"Желите ли да уклоните сав садржај?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"Складиште акредитива је обрисано."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"Брисање складишта акредитива није успело."</string>
     <string name="forget" msgid="3971143908183848527">"Заборави"</string>
     <string name="connect" msgid="5861699594602380150">"Повежи"</string>
     <string name="disconnect" msgid="6140789953324820336">"Прекини везу"</string>
@@ -667,6 +669,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Овим ћете избрисати налог за демонстрације и ресетовати систем на фабричка подешавања. Сви подаци корисника ће бити изгубљени."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Напусти режим демонстр."</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"ОДБАЦИ"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"Функција није доступна током вожње."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"Не можете да додате корисника током вожње."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"Функција није доступна током вожње"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"Не можете да додајете кориснике током вожње"</string>
 </resources>
diff --git a/res/values-sv/config.xml b/res/values-sv/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-sv/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index d6dde64..0d4ea95 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"Ej installerad för användaren"</string>
     <string name="permissions_label" msgid="2701446753515612685">"Behörigheter"</string>
     <string name="notifications_label" msgid="6586089149665170731">"Aviseringar"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"Lagringsutrymme och cacheminne"</string>
     <string name="application_version_label" msgid="8556889839783311649">"Version: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"Inga behörigheter har beviljats"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"Inga behörigheter har begärts"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s i internt lagringsutrymme"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"Dataanvändning"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"Appens dataanvändning"</string>
     <string name="computing_size" msgid="5791407621793083965">"Beräknar …"</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"Nyligen gjorda platsbegäranden"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"Inga platsbegäranden har gjorts nyligen"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"Behörigheter på appnivå"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"Platssökning"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"Platstjänster"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Wi‑Fi-sökning"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Tillåt att appar och tjänster söker efter Wi‑Fi-nätverk när som helst, även när Wi‑Fi är inaktiverat. Funktionen kan till exempel användas till att förbättra platsbaserade funktioner och tjänster."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"Bluetooth-sökning"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"Tillåt att appar och tjänster söker efter enheter i närheten när som helst, även när Bluetooth är inaktiverat. Funktionen kan till exempel användas till att förbättra platsbaserade funktioner och tjänster."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"System"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"Systemuppdateringar"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Android-version"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"Det gick inte att registrera <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"När du lägger till en betrodd enhet måste du lägga till en autentiseringsmetod också. Autentisering krävs för att komma åt profilen om du inte skulle ha den betrodda enheten med dig."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"Enheten har kopplats från."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"Rensa användaruppgifter"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"Ta bort alla certifikat"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"Vill du ta bort allt innehåll?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"Uppgiftslagring raderad."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"Det gick inte att radera uppgiftslagringen."</string>
     <string name="forget" msgid="3971143908183848527">"Glöm"</string>
     <string name="connect" msgid="5861699594602380150">"Anslut"</string>
     <string name="disconnect" msgid="6140789953324820336">"Koppla från"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Detta raderar demokontot och återställer standardinställningarna för systemet. All användardata tas bort."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Avsluta demoläget"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"IGNORERA"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"Funktionen är inte tillgänglig när du kör."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"Du kan inte lägga till användare medan du kör."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"Funktionen är inte tillgänglig när du kör"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"Du kan inte lägga till användare medan du kör"</string>
 </resources>
diff --git a/res/values-sw/config.xml b/res/values-sw/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-sw/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 8ed15fe..7e448da 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"Haijasakinishwa kwa ajili ya mtumiaji huyu"</string>
     <string name="permissions_label" msgid="2701446753515612685">"Ruhusa"</string>
     <string name="notifications_label" msgid="6586089149665170731">"Arifa"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"Nafasi ya hifadhi na akiba"</string>
     <string name="application_version_label" msgid="8556889839783311649">"Toleo: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"Hakuna ruhusa zilizotolewa"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"Hakuna ruhusa zilizoombwa"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s katika hifadhi ya mfumo"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"Matumizi ya data"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"Matumizi ya data ya programu"</string>
     <string name="computing_size" msgid="5791407621793083965">"Inahesabu…"</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"Maombi ya Hivi Karibuni ya Kutambua Eneo"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"Hamna maombi ya hivi karibuni ya kutambua eneo"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"Ruhusa za kiwango cha programu"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"Kutafuta"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"Huduma za Mahali"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Kutafuta Wi-Fi"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Ruhusu programu na huduma zitafute mitandao ya Wi-Fi wakati wowote, hata wakati umezima Wi-Fi. Hali hii inaweza kutumika, kwa mfano, kuboresha huduma na vipengele vinavyohusiana na mahali."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"Kutafuta Bluetooth"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"Ruhusu programu na huduma itafute vifaa vilivyo karibu wakati wowote, hata wakati umezima Bluetooth. Hali hii inaweza kutumika, kwa mfano, kuboresha huduma na vipengele vinavyohusiana na mahali."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"Mfumo"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"Masasisho ya mfumo"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Toleo la Android"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"Imeshindwa kuandikisha <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"Unatakiwa uweke njia ya kuthibitisha ili uongeze kifaa unachoamini katika hatua inayofuata. Kama huna kifaa unachoamini, uthibitishaji utataka idhini ya kufikia wasifu wako."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"Kifaa kimeondolewa."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"Futa hifadhi ya hati"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"Ondoa vyeti vyote"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"Ungependa kuondoa maudhui yote?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"Hifadhi ya hati imefutwa."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"Imeshindwa kufuta hifadhi ya hati."</string>
     <string name="forget" msgid="3971143908183848527">"Sahau"</string>
     <string name="connect" msgid="5861699594602380150">"Unganisha"</string>
     <string name="disconnect" msgid="6140789953324820336">"Tenganisha"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Hatua hii itafuta akaunti ya onyesho na kurejesha data ambayo kifaa kilitoka nayo kiwandani. Data yote ya mtumiaji itapotea."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Funga Onyesho"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"ONDOA"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"Kipengele hakipatikani unapoendesha gari."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"Huwezi kuongeza mtumiaji unapoendesha gari."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"Kipengele hakipatikani unapoendesha gari"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"Huwezi kuongeza mtumiaji unapoendesha gari"</string>
 </resources>
diff --git a/res/values-ta/config.xml b/res/values-ta/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-ta/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 0720992..d6defd3 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"இவருக்கு நிறுவப்படவில்லை"</string>
     <string name="permissions_label" msgid="2701446753515612685">"அனுமதிகள்"</string>
     <string name="notifications_label" msgid="6586089149665170731">"அறிவிப்புகள்"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"சேமிப்பகமும் தற்காலிக சேமிப்பும்"</string>
     <string name="application_version_label" msgid="8556889839783311649">"பதிப்பு: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"அனுமதிகள் எதுவும் வழங்கப்படவில்லை"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"அனுமதிகள் எதையும் கோரவில்லை"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"அகச் சேமிப்பகத்தில் %s"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"டேட்டா உபயோகம்"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"ஆப்ஸ் டேட்டா உபயோகம்"</string>
     <string name="computing_size" msgid="5791407621793083965">"கணக்கிடுகிறது…"</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"இருப்பிடத் தகவல் குறித்த சமீபத்திய கோரிக்கைகள்"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"இருப்பிடத் தகவல் குறித்த சமீபத்திய கோரிக்கைகள் இல்லை"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"ஆப்ஸ் நிலை அனுமதிகள்"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"ஸ்கேன் செய்தல்"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"இருப்பிடச் சேவைகள்"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"வைஃபை ஸ்கேன் செய்தல்"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"வைஃபை ஆஃப் செய்யப்பட்டிருந்தாலும்கூட எந்தநேரத்திலும் வைஃபை நெட்வொர்க்குகளைத் தேட ஆப்ஸையும் சேவைகளையும் அனுமதிக்கும். உதாரணத்திற்கு இருப்பிடம் சார்ந்த அம்சங்களையும் சேவைகளையும் மேம்படுத்துவதற்கும் இதைப் பயன்படுத்தலாம்."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"புளூடூத் ஸ்கேன் செய்தல்"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"புளூடூத் ஆஃப் செய்யப்பட்டிருந்தாலும்கூட எந்தநேரத்திலும் அருகிலுள்ள சாதனங்களைத் தேட ஆப்ஸையும் சேவைகளையும் அனுமதிக்கும். உதாரணத்திற்கு இருப்பிடம் சார்ந்த அம்சங்களையும் சேவைகளையும் மேம்படுத்துவதற்கும் இதைப் பயன்படுத்தலாம்."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"சிஸ்டம்"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"சிஸ்டம் புதுப்பிப்புகள்"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Android பதிப்பு"</string>
@@ -471,8 +468,8 @@
     <string name="choose_new_admin_title" msgid="1915428454917699587">"புதிய \'நிர்வாகிக் கணக்கைத்\' தேர்வு செய்க"</string>
     <string name="choose_new_admin_message" msgid="7468286545352043354">"குறைந்தபட்சம் ஒரு \'நிர்வாகிக் கணக்காவது’ இருக்க வேண்டும். இக்கணக்கை நீக்க, முதலில் ஒரு மாற்றுக் கணக்கைத் தேர்வு செய்யவும்."</string>
     <string name="choose_new_admin_label" msgid="5987653639387437939">"நிர்வாகியைத் தேர்வு செய்க"</string>
-    <string name="user_guest" msgid="3465399481257448601">"விருந்தினர்"</string>
-    <string name="start_guest_session" msgid="4438752398760283201">"விருந்தினர்"</string>
+    <string name="user_guest" msgid="3465399481257448601">"கெஸ்ட்"</string>
+    <string name="start_guest_session" msgid="4438752398760283201">"கெஸ்ட்"</string>
     <string name="user_switch" msgid="6544839750534690781">"பயனரை மாற்றும்"</string>
     <string name="current_user_name" msgid="3813671533249316823">"நீங்கள் (%1$s)"</string>
     <string name="user_name_label" msgid="3210832645046206845">"பெயர்"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> பதிவு செய்வதில் தோல்வி"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"நம்பகமான சாதனத்தைச் சேர்த்த பிறகு அடையாளச் சரிபார்ப்பு முறையை அமைக்க வேண்டும். உங்களிடம் நம்பகமான சாதனம் இல்லையெனில் அடையாளச் சரிபார்ப்பிற்காக உங்கள் சுயவிவரத்தை அணுக வேண்டிய அவசியம் ஏற்படும்."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"சாதனம் துண்டிக்கப்பட்டது."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"அனுமதிச் சான்றுகளை அழித்தல்"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"அனைத்து சான்றிதழ்களையும் அகற்றும்"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"அனைத்து உள்ளடக்கத்தையும் அகற்ற வேண்டுமா?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"நற்சான்று சேமிப்பகம் அழிக்கப்பட்டது."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"நற்சான்று சேமிப்பகத்தை அழிக்க முடியாது."</string>
     <string name="forget" msgid="3971143908183848527">"அகற்று"</string>
     <string name="connect" msgid="5861699594602380150">"இணை"</string>
     <string name="disconnect" msgid="6140789953324820336">"துண்டி"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"இவ்வாறு செய்தால், டெமோ கணக்கு நீக்கப்படுவதோடு, சாதனமானது தரவின் ஆரம்பநிலைக்கு மீட்டமைக்கப்படும். எல்லாப் பயனர் தரவையும் இழப்பீர்கள்."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"டெமோவிலிருந்து வெளியேறு"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"நிராகரி"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"வாகனம் ஓட்டும்போது, இந்த அம்சத்தைப் பயன்படுத்த முடியாது."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"வாகனம் ஓட்டும்போது, பயனரைச் சேர்க்க முடியாது."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"வாகனம் ஓட்டும்போது இந்த அம்சத்தைப் பயன்படுத்த இயலாது"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"வாகனம் ஓட்டும்போது பயனரைச் சேர்க்க முடியாது"</string>
 </resources>
diff --git a/res/values-te/config.xml b/res/values-te/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-te/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 4ab127f..c3f41c9 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"ఈ వినియోగదారుని కోసం ఇన్‌స్టాల్ చేయలేదు"</string>
     <string name="permissions_label" msgid="2701446753515612685">"అనుమతులు"</string>
     <string name="notifications_label" msgid="6586089149665170731">"నోటిఫికేషన్‌లు"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"నిల్వ &amp; కాష్"</string>
     <string name="application_version_label" msgid="8556889839783311649">"వెర్షన్: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"అనుమతులు మంజూరు కాలేదు"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"అనుమతులను అభ్యర్థించలేదు"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"అంతర్గత నిల్వలో %s"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"డేటా వినియోగం"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"యాప్ డేటా వినియోగం"</string>
     <string name="computing_size" msgid="5791407621793083965">"గణిస్తోంది…"</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"ఇటీవలి స్థాన అభ్యర్థనలు"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"ఇటీవలి స్థాన అభ్యర్థనలు లేవు"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"యాప్‌-స్థాయి అనుమతులు"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"స్కానింగ్"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"స్థాన సేవలు"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Wi‑Fi స్కానింగ్"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Wi‑Fi ఆఫ్‌లో ఉన్నా కూడా, ఏ సమయంలోనైనా Wi‑Fi నెట్‌‍వర్క్‌లను స్కాన్ చేయడానికి యాప్‌లను మరియు సేవలను అనుమతించండి. ఉదాహరణకు, ఇది స్థాన ఆధారిత ఫీచర్‌లు మరియు సేవలను మెరుగుపరచడానికి ఉపయోగించబడుతుంది."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"బ్లూటూత్ స్కానింగ్"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"బ్లూటూత్ ఆఫ్‌లో ఉన్నప్పుడు కూడా, ఏ సమయంలోనైనా సమీపంలోని పరికరాలను స్కాన్ చేయడానికి యాప్‌లను మరియు సేవలను అనుమతించండి. ఉదాహరణకు, ఇది స్థాన ఆధారిత ఫీచర్‌లు మరియు సేవలను మెరుగుపరచడానికి ఉపయోగించబడుతుంది."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"సిస్టమ్"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"సిస్టమ్ అప్‌డేట్‌లు"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Android వెర్షన్"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> నమోదు విఫలమైంది"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"విశ్వసనీయ పరికరాన్ని జోడించడానికి తర్వాత ప్రమాణీకరణ పద్ధతిని సెట్ చేయాల్సిన అవసరం ఉంది. మీ వద్ద మీ విశ్వసనీయ పరికరం లేకపోతే, మీ ప్రొఫైల్‌ను యాక్సెస్ చేయడానికి ప్రామాణీకరణ చేయాల్సిన అవసరం ఉంది."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"పరికరం డిస్‌కనెక్ట్ చేయబడింది."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"ఆధారాలను క్లియర్ చేయండి"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"అన్ని స‌ర్టిఫికెట్‌ల‌ను తీసివేయండి"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"అన్ని కంటెంట్‌లను తీసివేయాలా?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"ఆధారాల నిల్వ తొలగించబడింది."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"ఆధారాల నిల్వను తొలగించడం సాధ్యపడలేదు."</string>
     <string name="forget" msgid="3971143908183848527">"విస్మరించు"</string>
     <string name="connect" msgid="5861699594602380150">"కనెక్ట్ చేయి"</string>
     <string name="disconnect" msgid="6140789953324820336">"డిస్‌కనెక్ట్ చేయి"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"ఫ్యాక్టరీ డేటా డెమో ఖాతాను తొలగించి, సిస్టమ్‌ను రీసెట్ చేస్తుంది. మొత్తం వినియోగదారు డేటాను కోల్పోతారు."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"డెమో నుండి నిష్క్రమించండి"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"విస్మరించు"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"డ్రైవింగ్ చేస్తున్నప్పుడు ఫీచర్ అందుబాటులో ఉండదు."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"డ్రైవింగ్ చేస్తున్నప్పుడు వినియోగదారుని జోడించడం సాధ్యం కాదు."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"డ్రైవింగ్ చేస్తున్నప్పుడు ఈ ఫీచర్ అందుబాటులో ఉండదు"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"డ్రైవింగ్ చేస్తున్నప్పుడు, యూజర్‌ను జోడించడం సాధ్యం కాదు"</string>
 </resources>
diff --git a/res/values-th/config.xml b/res/values-th/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-th/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 02c3fc6..ded5f79 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"ไม่ได้ติดตั้งสำหรับผู้ใช้นี้"</string>
     <string name="permissions_label" msgid="2701446753515612685">"สิทธิ์"</string>
     <string name="notifications_label" msgid="6586089149665170731">"การแจ้งเตือน"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"พื้นที่เก็บข้อมูลและแคช"</string>
     <string name="application_version_label" msgid="8556889839783311649">"เวอร์ชัน: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"ไม่มีการมอบสิทธิ์"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"ไม่มีการขอสิทธิ์"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s ในที่จัดเก็บข้อมูลภายใน"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"ปริมาณการใช้อินเทอร์เน็ต"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"ปริมาณการใช้เน็ตของแอป"</string>
     <string name="computing_size" msgid="5791407621793083965">"กำลังคำนวณ…"</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"คำขอตำแหน่งล่าสุด"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"ไม่มีคำขอตำแหน่งล่าสุด"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"สิทธิ์ระดับแอป"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"การสแกน"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"บริการตำแหน่ง"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"การสแกนหา Wi‑Fi"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"อนุญาตให้แอปและบริการต่างๆ สแกนหาเครือข่าย Wi‑Fi ตลอดเวลาแม้ Wi‑Fi จะปิดอยู่ การตั้งค่านี้ใช้เพื่อปรับปรุงสิ่งต่างๆ เช่น ฟีเจอร์และบริการตามสถานที่"</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"การสแกนหาบลูทูธ"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"อนุญาตให้แอปและบริการต่างๆ สแกนหาอุปกรณ์ใกล้เคียงตลอดเวลา แม้บลูทูธจะปิดอยู่ การตั้งค่านี้ใช้เพื่อปรับปรุงสิ่งต่างๆ เช่น ฟีเจอร์และบริการตามสถานที่"</string>
     <string name="system_setting_title" msgid="6864599341809463440">"ระบบ"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"การอัปเดตระบบ"</string>
     <string name="firmware_version" msgid="8491753744549309333">"เวอร์ชันของ Android"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"การลงทะเบียน <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ล้มเหลว"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"ในการเพิ่มอุปกรณ์ที่เชื่อถือได้ คุณจำเป็นต้องกำหนดวิธีการตรวจสอบสิทธิ์ในขั้นถัดไป หากไม่มีอุปกรณ์ที่เชื่อถือได้ ระบบจะขอให้มีการตรวจสอบสิทธิ์ในการเข้าถึงโปรไฟล์ของคุณ"</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"อุปกรณ์ถูกตัดการเชื่อมต่อ"</string>
+    <string name="credentials_reset" msgid="873900550885788639">"ล้างข้อมูลรับรอง"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"นำใบรับรองทั้งหมดออก"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"ลบเนื้อหาทั้งหมดหรือไม่"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"ลบที่เก็บข้อมูลรับรองแล้ว"</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"ไม่สามารถลบที่เก็บข้อมูลรับรอง"</string>
     <string name="forget" msgid="3971143908183848527">"ลืม"</string>
     <string name="connect" msgid="5861699594602380150">"เชื่อมต่อ"</string>
     <string name="disconnect" msgid="6140789953324820336">"ยกเลิกการเชื่อมต่อ"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"การดำเนินการนี้จะลบบัญชีสาธิตและรีเซ็ตข้อมูลในระบบเป็นค่าเริ่มต้น ข้อมูลผู้ใช้ทั้งหมดจะสูญหาย"</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"ออกจากการสาธิต"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"ปิด"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"ฟีเจอร์ไม่พร้อมใช้งานขณะขับรถ"</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"เพิ่มผู้ใช้ขณะขับรถไม่ได้"</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"ฟีเจอร์ไม่พร้อมใช้งานขณะขับรถ"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"เพิ่มผู้ใช้ขณะขับรถไม่ได้"</string>
 </resources>
diff --git a/res/values-tl/config.xml b/res/values-tl/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-tl/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index b2ab7c3..41eb34d 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"Hindi naka-install para sa user na ito"</string>
     <string name="permissions_label" msgid="2701446753515612685">"Mga Pahintulot"</string>
     <string name="notifications_label" msgid="6586089149665170731">"Mga Notification"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"Storage at cache"</string>
     <string name="application_version_label" msgid="8556889839783311649">"Bersyon: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"Walang ibinigay na pahintulot"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"Walang hiniling na pahintulot"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s sa internal storage"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"Paggamit ng data"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"Paggamit ng data ng app"</string>
     <string name="computing_size" msgid="5791407621793083965">"Kinakalkula…"</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"Mga Kamakailang Kahilingan sa Lokasyon"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"Walang kamakailang kahilingan sa lokasyon"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"Mga pahintulot sa antas ng app"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"Pag-scan"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"Mga Serbisyo ng Lokasyon"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Pag-scan ng Wi‑Fi"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Bigyang-daan ang mga app at serbisyo na mag-scan ng mga Wi-Fi network anumang oras, kahit na naka-off ang Wi-Fi. Magagamit ito, halimbawa, para pahusayin ang mga feature at serbisyong batay sa lokasyon."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"Pag-scan ng Bluetooth"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"Bigyang-daan ang mga app at serbisyo na mag-scan ng mga kalapit na device anumang oras, kahit na naka-off ang Bluetooth. Magagamit ito, halimbawa, para pahusayin ang mga feature at serbisyong batay sa lokasyon."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"System"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"Mga pag-update ng system"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Bersyon ng Android"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"Hindi na-enroll ang <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"Kapag nagdagdag ng pinagkakatiwalaang device, kinakailangan mong magtakda ng paraan ng pag-authenticate. Kung wala sa iyo ang pinagkakatiwalaan mong device, kakailanganin ang pag-authenticate para ma-access ang iyong profile."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"Nadiskonekta ang device."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"I-clear ang mga kredensyal"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"Alisin ang lahat ng certificate"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"Alisin ang lahat ng content?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"Binura ang storage ng kredensyal."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"Hindi mabura ang storage ng kredensyal."</string>
     <string name="forget" msgid="3971143908183848527">"Kalimutan"</string>
     <string name="connect" msgid="5861699594602380150">"Kumonekta"</string>
     <string name="disconnect" msgid="6140789953324820336">"Idiskonekta"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Ide-delete nito ang demo account at ire-reset ang factory data ng system. Mawawala ang lahat ng data ng user."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Lumabas sa Demo"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"I-DISMISS"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"Hindi available ang feature habang nagmamaneho."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"Hindi maaaring magdagdag ng user habang nagmamaneho."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"Hindi available ang feature habang nagmamaneho"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"Hindi makakapagdagdag ng user habang nagmamaneho"</string>
 </resources>
diff --git a/res/values-tr/config.xml b/res/values-tr/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-tr/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 6290cc5..eca6594 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"Bu kullanıcı için yüklü değil"</string>
     <string name="permissions_label" msgid="2701446753515612685">"İzinler"</string>
     <string name="notifications_label" msgid="6586089149665170731">"Bildirimler"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"Depolama alanı ve önbellek"</string>
     <string name="application_version_label" msgid="8556889839783311649">"Sürüm: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"Hiçbir izin verilmedi"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"Hiçbir izin istenmedi"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"Dahili depolama alanında %s"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"Veri kullanımı"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"Uygulama veri kullanımı"</string>
     <string name="computing_size" msgid="5791407621793083965">"Hesaplanıyor…"</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"Yeni Konum İstekleri"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"Yeni konum isteği yok"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"Uygulama düzeyinde izinler"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"Tarama"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"Konum Hizmetleri"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Kablosuz taraması"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Uygulamaların ve hizmetlerin kablosuz ağları Kablosuz özelliği kapalıyken bile her zaman taramasına izin verin. Bu özellik, konuma dayalı özellikleri ve hizmetleri iyileştirme gibi amaçlar için kullanılabilir."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"Bluetooth taraması"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"Uygulamaların ve hizmetlerin etrafınızdaki cihazları Bluetooth kapalıyken bile her zaman taramasına izin verin. Bu özellik, konuma dayalı özellikleri ve hizmetleri iyileştirme gibi amaçlar için kullanılabilir."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"Sistem"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"Sistem güncellemeleri"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Android sürümü"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kaydı başarısız oldu"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"Güvenilen cihaz eklemek için kimlik doğrulama yöntemi belirlemeniz gerekir. Güvenilen cihazınız yanınızda değilse profilinize erişmek için kimlik doğrulama gerekecektir."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"Cihazın bağlantısı kesildi."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"Kimlik bilgilerini temizle"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"Tüm sertifikaları kaldır"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"Tüm içerik kaldırılsın mı?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"Kimlik bilgileri deposu silindi."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"Kimlik bilgileri deposu silinemedi."</string>
     <string name="forget" msgid="3971143908183848527">"Unut"</string>
     <string name="connect" msgid="5861699594602380150">"Bağlan"</string>
     <string name="disconnect" msgid="6140789953324820336">"Bağlantıyı kes"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Bu işlem, demo hesabını silecek ve sistemi fabrika verilerine sıfırlayacak. Tüm kullanıcı verileri kaybolacak."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Demodan çık"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"KAPAT"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"Sürüş sırasında bu özellik kullanılamaz."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"Sürüş sırasında kullanıcı eklenemez."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"Sürüş sırasında bu özellik kullanılamaz"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"Sürüş sırasında kullanıcı eklenemez"</string>
 </resources>
diff --git a/res/values-uk/config.xml b/res/values-uk/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-uk/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 3f875b0..e31c334 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -206,7 +206,7 @@
     <string name="keyboard_settings" msgid="1959697870618278081">"Клавіатура"</string>
     <string name="manage_keyboard" msgid="4045394766282200132">"Керуйте клавіатурами"</string>
     <string name="text_to_speech_settings" msgid="811985746199507343">"Вивід синтезу мовлення"</string>
-    <string name="text_to_speech_preferred_engine_settings" msgid="2766782925699132256">"Бажана система"</string>
+    <string name="text_to_speech_preferred_engine_settings" msgid="2766782925699132256">"Система за умовчанням"</string>
     <string name="text_to_speech_current_engine" msgid="8133107484909612597">"Поточна система"</string>
     <string name="tts_speech_rate" msgid="4512944877291943133">"Темп мовлення"</string>
     <string name="tts_pitch" msgid="2389171233852604923">"Тон"</string>
@@ -287,9 +287,11 @@
     <string name="not_installed" msgid="4218816013370552746">"Не встановлено для цього користувача"</string>
     <string name="permissions_label" msgid="2701446753515612685">"Дозволи"</string>
     <string name="notifications_label" msgid="6586089149665170731">"Сповіщення"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"Пам\'ять і кеш"</string>
     <string name="application_version_label" msgid="8556889839783311649">"Версія: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"Дозволи не надано"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"Немає запитів на дозволи"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s у внутрішній пам\'яті"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"Використання трафіку"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"Використання трафіку"</string>
     <string name="computing_size" msgid="5791407621793083965">"Обчислення…"</string>
@@ -350,12 +352,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"Останні запити на геодані"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"Немає останніх запитів на геодані"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"Дозволи на рівні додатка"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"Пошук"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"Служби локації"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Пошук мереж Wi-Fi"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Дозволити додаткам і службам будь-коли шукати мережі Wi-Fi, навіть коли Wi-Fi вимкнено. Це може покращити, наприклад, роботу функцій і служб, які використовують геодані."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"Пошук пристроїв Bluetooth"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"Дозволити додаткам і службам будь-коли шукати пристрої поруч, навіть коли Bluetooth вимкнено. Це може покращити, наприклад, роботу функцій і служб, які використовують геодані."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"Система"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"Оновлення системи"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Версія Android"</string>
@@ -664,6 +661,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"Не вдалося зареєструвати пристрій <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"Додавши надійний пристрій, потрібно налаштувати спосіб автентифікації. Якщо пристрій не з вами, автентифікація знадобиться для доступу в профіль."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"Утрачено з’єднання з пристроєм."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"Очистити облікові дані"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"Вилучити всі сертифікати"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"Вилучити весь вміст?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"Сховище облікових даних очищено."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"Не вдалося очистити сховище облікових даних."</string>
     <string name="forget" msgid="3971143908183848527">"Забути"</string>
     <string name="connect" msgid="5861699594602380150">"Підключити"</string>
     <string name="disconnect" msgid="6140789953324820336">"Від’єднати"</string>
@@ -679,6 +681,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Буде видалено демонстраційний обліковий запис і відновлено заводські налаштування системи. Усі дані користувача буде втрачено."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Вийти з демо-режиму"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"ЗАКРИТИ"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"Функція недоступна під час руху автомобіля."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"Неможливо додати користувача під час руху автомобіля."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"Функція недоступна під час руху автомобіля"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"Неможливо додати користувача під час руху автомобіля"</string>
 </resources>
diff --git a/res/values-ur/config.xml b/res/values-ur/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-ur/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 59973fa..db8e48b 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"اس صارف کیلئے انسٹال نہیں ہے"</string>
     <string name="permissions_label" msgid="2701446753515612685">"اجازتیں"</string>
     <string name="notifications_label" msgid="6586089149665170731">"اطلاعات"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"اسٹوریج اور کیش"</string>
     <string name="application_version_label" msgid="8556889839783311649">"ورژن: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"کوئی اجازت نہیں دی گئی"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"کسی اجازت کی درخواست نہیں کی گئی"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"داخلی اسٹوریج میں %s"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"ڈیٹا کا استعمال"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"ایپ ڈیٹا کا استعمال"</string>
     <string name="computing_size" msgid="5791407621793083965">"حساب کتاب کیا جا رہا ہے…"</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"مقام کی حالیہ درخواستیں"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"مقام کی کوئی حالیہ درخواست نہیں ہے"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"ایپ کی سطح کی اجازتیں"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"اسکیننگ"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"مقام کی سروسز"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Wi‑Fi اسکیننگ"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Wi‑Fi کے آف ہونے پر بھی ایپس اور سروسز کو کسی بھی وقت Wi‑Fi نیٹ ورکس اسکین کرنے کی اجازت دیں۔ مثال کے طور، اسے مقام پر مبنی خصوصیات اور سروسز کو بہتر بنانے کے لیے استعمال کیا جا سکتا ہے۔"</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"بلوٹوتھ اسکیننگ"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"بلوٹوتھ کے آف ہونے پر بھی ایپس اور سروسز کو کسی بھی وقت قریبی آلات اسکین کرنے کی اجازت دیں۔ مثال کے طور، اسے مقام پر مبنی خصوصیات اور سروسز کو بہتر بنانے کے لیے استعمال کیا جا سکتا ہے۔"</string>
     <string name="system_setting_title" msgid="6864599341809463440">"سسٹم"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"سسٹم اپ ڈیٹس"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Android ورژن"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> اندراج ناکام ہوگیا"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"بھروسہ مند آلہ شامل کرنے کے لیے آپ کو آگے ایک تصدیقی طریقہ سیٹ کرنا ہوگا۔ اگر آپ کے پاس بھروسہ مند آلہ نہیں ہے تو آپ کے پروفائل تک رسائی حاصل کرنے کے لیے تصدیق درکار ہوگی۔"</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"آلہ غیر منسلک ہو گیا۔"</string>
+    <string name="credentials_reset" msgid="873900550885788639">"اسنادات صاف کریں"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"سبھی سرٹیفیکیٹس کو ہٹائیں"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"سبھی مواد کو ہٹائیں؟"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"اسناد کا اسٹوریج حذف ہو گیا۔"</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"اسناد کا اسٹوریج صاف نہیں کیا جا سکا۔"</string>
     <string name="forget" msgid="3971143908183848527">"بھول جائیں"</string>
     <string name="connect" msgid="5861699594602380150">"منسلک کریں"</string>
     <string name="disconnect" msgid="6140789953324820336">"غیر منسلک کریں"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"اس سے ڈیمو اکاؤنٹ اور فیکٹری ڈیٹا کی دوبارہ ترتیب کا سسٹم حذف ہو جائے گا۔ تمام صارف ڈیٹا غائب ہو جائیں گے۔"</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"ڈیمو سے باہر نکلیں"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"برخاست کریں"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"ڈرائیونگ کے دوران یہ خصوصیت دستیاب نہیں ہے۔"</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"ڈرائیونگ کے دوران صارف کو شامل نہیں کیا جا سکتا۔"</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"ڈرائیونگ کے دوران یہ خصوصیت دستیاب نہیں ہے"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"ڈرائیونگ کے دوران صارف کو شامل نہیں کیا جا سکتا"</string>
 </resources>
diff --git a/res/values-uz/config.xml b/res/values-uz/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-uz/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 100bb4d..ebda095 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"Bu foydaluvchi uchun oʻrnatilmagan"</string>
     <string name="permissions_label" msgid="2701446753515612685">"Ruxsatnomalar"</string>
     <string name="notifications_label" msgid="6586089149665170731">"Bildirishnomalar"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"Xotira va kesh"</string>
     <string name="application_version_label" msgid="8556889839783311649">"Versiyasi: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"Hech qanday ruxsat berilmagan"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"Hech qanday ruxsat so‘ralmagan"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s ichki xotirada"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"Trafik sarfi"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"Ilova sarflagan trafik"</string>
     <string name="computing_size" msgid="5791407621793083965">"Hisoblanmoqda…"</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"Oxirgi joylashuv axboroti talablari"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"Hech qanday joylashuvga oid talablar olinmagan"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"Ilovalar uchun ruxsatlar"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"Qidiruv"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"Joylashuv axborotiga asoslangan xizmatlar"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Wi-Fi tarmoqlarni qidirish"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Wi-Fi yoniq emasligida ham ilovalar va xizmatlarga Wi-Fi tarmoqlarni qidirish uchun ruxsat. Shunda joylashuv axborotiga asoslangan funksiya va xizmatlarning ishlashi yanada yaxshilanadi."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"Bluetooth qurilmalarni qidirish"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"Bluetooth yoniq emasligida ham ilovalar va xizmatlarga yaqin-atrofdagi qurilmalarni qidirish uchun ruxsat. Shunda joylashuv axborotiga asoslangan funksiya va xizmatlarning ishlashi yanada yaxshilanadi."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"Tizim"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"Tizimni yangilash"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Android versiyasi"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> qayd qilinmadi"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"Ishonchl qurilma kiritgandan keyin autentifikatsiya usulini sozlash talab qilinadi. Agar ishonchli qurilma yoningizda boʻlmasa, autentifikatsiya profilingizga kirishda talab etiladi."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"Qurilma uzildi."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"Hisob axborotini tozalash"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"Barcha sertifikatlarni olib tashlash"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"Hamma narsa oʻchirib tashlansinmi?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"Hisob axborotlari ombori tozalandi."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"Hisob axborotlari ombori tozalanmadi."</string>
     <string name="forget" msgid="3971143908183848527">"Olib tashlash"</string>
     <string name="connect" msgid="5861699594602380150">"Ulash"</string>
     <string name="disconnect" msgid="6140789953324820336">"Uzish"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Bunda demo hisob o‘chirib tashlanadi va tizim zavod sozlamalariga qaytariladi. Barcha foydalanuvchi ma’lumotlari tozalab tashlanadi."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Demodan chiqish"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"YOPISH"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"Avtomobilda harakatlanayotganda bu funksiya ishlamaydi."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"Avtomobilda harakatlanayotganda foydalanuvchi qo‘shilmaydi."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"Avtomobilda harakatlanayotganda bu funksiya ishlamaydi"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"Avtomobilda harakatlanayotganda foydalanuvchi kiritilmaydi"</string>
 </resources>
diff --git a/res/values-vi/config.xml b/res/values-vi/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-vi/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index b78f271..0dcab57 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"Chưa cài đặt cho người dùng này"</string>
     <string name="permissions_label" msgid="2701446753515612685">"Quyền"</string>
     <string name="notifications_label" msgid="6586089149665170731">"Thông báo"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"Bộ nhớ và bộ nhớ đệm"</string>
     <string name="application_version_label" msgid="8556889839783311649">"Phiên bản: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"Chưa được cấp quyền nào"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"Không yêu cầu quyền"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s trong bộ nhớ trong"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"Mức sử dụng dữ liệu"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"Sử dụng dữ liệu ứng dụng"</string>
     <string name="computing_size" msgid="5791407621793083965">"Đang tính toán…"</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"Yêu cầu vị trí gần đây"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"Không có yêu cầu vị trí gần đây nào"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"Quyền cấp ứng dụng"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"Quét"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"Dịch vụ vị trí"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Quét Wi‑Fi"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Cho phép các ứng dụng và dịch vụ quét tìm mạng Wi‑Fi bất kỳ lúc nào, ngay cả khi Wi-Fi tắt. Bạn có thể sử dụng tùy chọn cài đặt này để cải thiện các tính năng và dịch vụ dựa trên vị trí."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"Quét tìm Bluetooth"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"Cho phép các ứng dụng và dịch vụ quét tìm thiết bị lân cận bất kỳ lúc nào, ngay cả khi Bluetooth đang tắt. Bạn có thể sử dụng tùy chọn cài đặt này để cải thiện các tính năng và dịch vụ dựa trên vị trí."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"Hệ thống"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"Bản cập nhật hệ thống"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Phiên bản Android"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"Không đăng ký được <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"Sau khi thêm thiết bị tin cậy, bạn phải đặt một phương thức xác thực. Nếu không mang theo thiết bị tin cậy, bạn sẽ phải sử dụng phương thức xác thực này để truy cập hồ sơ của mình."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"Đã ngắt kết nối thiết bị."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"Xóa thông tin xác thực"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"Xóa tất cả chứng chỉ"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"Xóa tất cả nội dung?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"Đã xóa vùng lưu trữ thông tin xác thực."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"Không thể xóa vùng lưu trữ thông tin xác thực."</string>
     <string name="forget" msgid="3971143908183848527">"Xóa"</string>
     <string name="connect" msgid="5861699594602380150">"Kết nối"</string>
     <string name="disconnect" msgid="6140789953324820336">"Ngắt kết nối"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Thao tác này sẽ xóa tài khoản demo và thiết lập lại dữ liệu ban đầu cho hệ thống. Tất cả dữ liệu người dùng sẽ bị mất."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Thoát chế độ demo"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"BỎ QUA"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"Bạn không sử dụng được tính năng này khi đang lái xe."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"Không thể thêm người dùng trong khi lái xe."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"Bạn không sử dụng được tính năng này khi đang lái xe"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"Không thể thêm người dùng khi đang lái xe"</string>
 </resources>
diff --git a/res/values-zh-rCN/config.xml b/res/values-zh-rCN/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-zh-rCN/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index a6cf95a..bf185ba 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -87,8 +87,7 @@
     <string name="wifi_settings" msgid="7701477685273103841">"WLAN"</string>
     <string name="wifi_starting" msgid="473253087503153167">"正在开启 WLAN…"</string>
     <string name="wifi_stopping" msgid="3534173972547890148">"正在关闭 WLAN…"</string>
-    <!-- no translation found for loading_wifi_list (8584901433195876465) -->
-    <skip />
+    <string name="loading_wifi_list" msgid="8584901433195876465">"正在加载 WLAN 列表"</string>
     <string name="wifi_disabled" msgid="5013262438128749950">"已停用 WLAN"</string>
     <string name="wifi_failed_forget_message" msgid="121732682699377206">"无法取消保存网络"</string>
     <string name="wifi_failed_connect_message" msgid="4447498225022147324">"无法连接到网络"</string>
@@ -199,8 +198,7 @@
     <string name="bluetooth_notif_message" msgid="1060821000510108726">"点按即可与 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 配对。"</string>
     <string name="bluetooth_device_picker" msgid="673238198452345475">"选择蓝牙设备"</string>
     <string name="language_settings" msgid="2079258598337245546">"语言"</string>
-    <!-- no translation found for languages_and_input_settings (3672322610529408248) -->
-    <skip />
+    <string name="languages_and_input_settings" msgid="3672322610529408248">"语言和输入法"</string>
     <string name="keyboard_settings" msgid="1959697870618278081">"键盘"</string>
     <string name="manage_keyboard" msgid="4045394766282200132">"管理键盘"</string>
     <string name="text_to_speech_settings" msgid="811985746199507343">"文字转语音 (TTS) 输出"</string>
@@ -285,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"尚未为此用户安装"</string>
     <string name="permissions_label" msgid="2701446753515612685">"权限"</string>
     <string name="notifications_label" msgid="6586089149665170731">"通知"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"存储空间和缓存"</string>
     <string name="application_version_label" msgid="8556889839783311649">"版本:%1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"未授予任何权限"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"未请求任何权限"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"将使用%s的内部存储空间"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"流量使用情况"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"应用的流量使用情况"</string>
     <string name="computing_size" msgid="5791407621793083965">"正在计算…"</string>
@@ -346,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"最近的位置信息请求"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"最近没有任何位置信息请求"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"应用级权限"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"扫描"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"位置信息服务"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"WLAN 扫描"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"允许应用和服务随时扫描 WLAN 网络(即使 WLAN 已关闭)。这可用于改进基于位置的功能和服务。"</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"蓝牙扫描"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"允许应用和服务随时扫描附近的设备(即使蓝牙已关闭)。这可用于改进基于位置的功能和服务。"</string>
     <string name="system_setting_title" msgid="6864599341809463440">"系统"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"系统更新"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Android 版本"</string>
@@ -412,7 +407,7 @@
     <string name="reset_app_pref_button_text" msgid="6270820447321231609">"重置应用"</string>
     <string name="reset_app_pref_complete_toast" msgid="8709072932243594166">"已重置应用偏好设置"</string>
     <string name="master_clear_title" msgid="8515335233363214414">"清空所有数据(恢复出厂设置)"</string>
-    <string name="master_clear_desc" msgid="9058719802779893535">"这样做将会清空您车辆音响主机中的所有数据,其中包括:\n\n"<li>"您的 Google 帐号"</li>\n<li>"系统与应用的数据和设置"</li>\n<li>"已下载的应用"</li></string>
+    <string name="master_clear_desc" msgid="9058719802779893535">"这样做将会清空您车机中的所有数据,其中包括:\n\n"<li>"您的 Google 帐号"</li>\n<li>"系统与应用的数据和设置"</li>\n<li>"已下载的应用"</li></string>
     <string name="master_clear_accounts" msgid="7797522012993567494">"您目前已登录以下帐号:"</string>
     <string name="master_clear_other_users_present" msgid="8383376863095743337">"此车辆目前还有其他用户。"</string>
     <string name="master_clear_button_text" msgid="8010754220392741160">"重置车辆"</string>
@@ -539,8 +534,7 @@
     <string name="security_lock_pin" msgid="4891899974369503200">"PIN 码"</string>
     <string name="security_lock_password" msgid="4420203740048322494">"密码"</string>
     <string name="lock_settings_picker_title" msgid="6590330165050361632">"选择一种锁定类型"</string>
-    <!-- no translation found for screen_lock_options (8531177937577168185) -->
-    <skip />
+    <string name="screen_lock_options" msgid="8531177937577168185">"锁定选项"</string>
     <string name="lock_settings_enter_pattern" msgid="4826034565853171624">"绘制您的图案"</string>
     <string name="lockpattern_confirm_button_text" msgid="7784925958324484965">"确认"</string>
     <string name="lockpattern_restart_button_text" msgid="9355771277617537">"重新绘制"</string>
@@ -643,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> 注册失败"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"添加可信设备后,接下来您必须设置身份验证方法。如果您没有随身携带可信设备,则必须进行身份验证才能访问自己的个人资料。"</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"设备已断开连接。"</string>
+    <string name="credentials_reset" msgid="873900550885788639">"清除凭据"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"移除所有证书"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"要移除所有内容吗?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"凭据存储空间已清空。"</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"无法清空凭据存储空间。"</string>
     <string name="forget" msgid="3971143908183848527">"忽略"</string>
     <string name="connect" msgid="5861699594602380150">"连接"</string>
     <string name="disconnect" msgid="6140789953324820336">"断开连接"</string>
@@ -658,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"这项操作会删除演示帐号并将系统恢复出厂设置,且所有用户数据都会丢失。"</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"退出演示模式"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"关闭"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"无法在驾驶时使用此功能。"</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"驾车时无法添加用户。"</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"驾车时无法使用此功能"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"驾车时无法添加用户"</string>
 </resources>
diff --git a/res/values-zh-rHK/config.xml b/res/values-zh-rHK/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-zh-rHK/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index fcb4711..2aa4414 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -19,7 +19,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="settings_label" msgid="5147911978211079839">"設定"</string>
     <string name="more_settings_label" msgid="3867559443480110616">"更多"</string>
-    <string name="display_settings" msgid="5325515247739279185">"顯示"</string>
+    <string name="display_settings" msgid="5325515247739279185">"螢幕"</string>
     <string name="brightness" msgid="2919605130898772866">"亮度"</string>
     <string name="auto_brightness_title" msgid="9124647862844666581">"自動調校光暗"</string>
     <string name="auto_brightness_summary" msgid="4741887033140384352">"按環境光線優化亮度"</string>
@@ -153,7 +153,7 @@
     <string name="wifi_ap_band_select_one" msgid="615578175244067396">"請為 Wi-Fi 熱點至少選擇一個頻段:"</string>
     <string name="tether_settings_title_all" msgid="4663704772599383169">"熱點和網絡共享"</string>
     <string name="wifi_hotspot_auto_off_title" msgid="7871858619924599922">"自動關閉熱點"</string>
-    <string name="wifi_hotspot_auto_off_summary" msgid="4830341947541735136">"如果未連接任何裝置,Wi‑Fi 熱點將會關閉"</string>
+    <string name="wifi_hotspot_auto_off_summary" msgid="4830341947541735136">"當沒有連接任何裝置時,Wi‑Fi 熱點就會關閉"</string>
     <string name="wifi_ask_enable" msgid="4452418245680754578">"「<xliff:g id="REQUESTER">%s</xliff:g>」要求開啟 Wi-Fi"</string>
     <string name="wifi_ask_disable" msgid="2949290055916181553">"「<xliff:g id="REQUESTER">%s</xliff:g>」要求關閉 Wi-Fi"</string>
     <string name="wifi_error" msgid="3105105447117289410">"錯誤"</string>
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"沒有為此使用者安裝"</string>
     <string name="permissions_label" msgid="2701446753515612685">"權限"</string>
     <string name="notifications_label" msgid="6586089149665170731">"通知"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"儲存空間與快取空間"</string>
     <string name="application_version_label" msgid="8556889839783311649">"版本:%1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"沒有授予權限"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"沒有要求權限"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"佔了內部儲存空間 %s"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"數據用量"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"應用程式數據用量"</string>
     <string name="computing_size" msgid="5791407621793083965">"正在計算…"</string>
@@ -335,7 +337,7 @@
     <string name="notification_listener_revoke_warning_cancel" msgid="4399941651358241154">"取消"</string>
     <string name="premium_sms_access_title" msgid="1409118461646148686">"付費短訊存取權"</string>
     <string name="premium_sms_access_description" msgid="7119026067677052169">"付費短訊的費用可能高昂,並會增加您流動網絡供應商帳單的款項。如果您為應用程式開放權限,將可以透過該應用程式發送付費短訊。"</string>
-    <string name="usage_access_title" msgid="7153427122072303254">"使用情況存取權"</string>
+    <string name="usage_access_title" msgid="7153427122072303254">"使用紀錄存取權"</string>
     <string name="usage_access_description" msgid="2413168719257435422">"使用記錄存取權允許應用程式追蹤您正在使用的其他應用程式和使用頻率,以及流動網絡供應商、語言設定和其他詳情。"</string>
     <string name="wifi_control_title" msgid="5660436566907731929">"Wi-Fi 控制"</string>
     <string name="wifi_control_description" msgid="6021926850423169261">"Wi-Fi 控制允許應用程式開啟或關閉 Wi-Fi,掃瞄和連線至 Wi-Fi 網絡、新增或移除網絡,或啟動僅限本機的熱點。"</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"最近的位置資訊要求"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"最近沒有位置資訊要求"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"應用程式層級權限"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"掃瞄"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"定位服務"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Wi-Fi 掃瞄"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"允許應用程式和服務隨時掃瞄 Wi-Fi 網絡 (即使 Wi-Fi 已關閉)。此操作可用來改善適地性功能和服務。"</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"藍牙掃瞄"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"允許應用程式和服務隨時掃瞄附近的裝置 (即使藍牙功能已關閉)。此操作可用來改善適地性功能和服務。"</string>
     <string name="system_setting_title" msgid="6864599341809463440">"系統"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"系統更新"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Android 版本"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」註冊失敗"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"如要加入信任的裝置,則需要在下一步設定驗證方法。如果未有攜帶信任的裝置,便需要通過驗證才可存取您的設定檔。"</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"裝置已中斷連線。"</string>
+    <string name="credentials_reset" msgid="873900550885788639">"清除憑證"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"移除所有憑證"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"要移除所有內容嗎?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"認證儲存空間已清除。"</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"無法清除認證儲存空間。"</string>
     <string name="forget" msgid="3971143908183848527">"忘記"</string>
     <string name="connect" msgid="5861699594602380150">"連接"</string>
     <string name="disconnect" msgid="6140789953324820336">"解除連接"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"執行這項操作後,示範模式帳戶會刪除,而系統會回復原廠設定。所有使用者資料將會失去。"</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"結束示範模式"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"關閉"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"無法在駕駛時使用此功能。"</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"無法在駕駛時新增使用者。"</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"無法在駕駛時使用此功能"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"無法在駕駛時新增使用者"</string>
 </resources>
diff --git a/res/values-zh-rTW/config.xml b/res/values-zh-rTW/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-zh-rTW/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index b612028..76c357c 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"這位使用者並未安裝"</string>
     <string name="permissions_label" msgid="2701446753515612685">"權限"</string>
     <string name="notifications_label" msgid="6586089149665170731">"通知"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"儲存空間和快取"</string>
     <string name="application_version_label" msgid="8556889839783311649">"版本:%1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"未取得任何授權"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"未要求任何權限"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s (內部儲存空間)"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"數據用量"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"應用程式數據用量"</string>
     <string name="computing_size" msgid="5791407621793083965">"計算中…"</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"最近的定位要求"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"最近沒有任何定位要求"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"應用程式層級權限"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"掃描"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"定位服務"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Wi-Fi 掃描"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"允許應用程式和服務隨時掃描 Wi‑Fi 網路 (即使 Wi-Fi 功能處於關閉狀態)。這可以用來改善適地性功能和服務。"</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"藍牙掃描"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"允許應用程式和服務隨時掃描附近裝置 (即使藍牙功能處於關閉狀態)。這可以用來改善適地性功能和服務。"</string>
     <string name="system_setting_title" msgid="6864599341809463440">"系統"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"系統更新"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Android 版本"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"無法註冊 <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"你必須在新增信任的裝置後設定驗證方法。如果你手邊沒有信任的裝置,就必須通過驗證才能存取自己的個人資料。"</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"裝置已中斷連線。"</string>
+    <string name="credentials_reset" msgid="873900550885788639">"清除憑證"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"移除所有憑證"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"要移除所有內容嗎?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"憑證儲存空間已清除。"</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"無法清除憑證儲存空間。"</string>
     <string name="forget" msgid="3971143908183848527">"清除"</string>
     <string name="connect" msgid="5861699594602380150">"連線"</string>
     <string name="disconnect" msgid="6140789953324820336">"中斷連線"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"這項操作會刪除示範帳戶並將系統恢復原廠設定,且所有使用者資料都會遺失。"</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"結束示範模式"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"關閉"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"開車時無法使用這項功能。"</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"無法在開車期間新增使用者。"</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"開車時無法使用這項功能"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"開車時無法新增使用者"</string>
 </resources>
diff --git a/res/values-zu/config.xml b/res/values-zu/config.xml
new file mode 100644
index 0000000..59bbaf1
--- /dev/null
+++ b/res/values-zu/config.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Copyright 2018 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="config_ringtone_uri_map_value">
+    <item msgid="4837640140181468537">"content://settings/system/notification_sound"</item>
+    <item msgid="3796938293683976227">"content://settings/system/alarm_alert"</item>
+  </string-array>
+    <!-- no translation found for config_ignore_ux_restrictions:0 (8853327491762695536) -->
+    <!-- no translation found for config_ignore_ux_restrictions:1 (956936134143623179) -->
+    <!-- no translation found for config_ignore_ux_restrictions:2 (5185827099072843729) -->
+    <!-- no translation found for config_ignore_ux_restrictions:3 (1988018090665203859) -->
+    <!-- no translation found for config_ignore_ux_restrictions:4 (7576774660996184365) -->
+    <!-- no translation found for config_ignore_ux_restrictions:5 (3156020424045546076) -->
+</resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index f15241c..d14f424 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -283,9 +283,11 @@
     <string name="not_installed" msgid="4218816013370552746">"Akufakiwe kulo msebenzisi"</string>
     <string name="permissions_label" msgid="2701446753515612685">"Izimvume"</string>
     <string name="notifications_label" msgid="6586089149665170731">"Izaziso"</string>
+    <string name="storage_application_label" msgid="5911779903670978586">"Isitoreji nenqolobane"</string>
     <string name="application_version_label" msgid="8556889839783311649">"Inguqulo: %1$s"</string>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="6001439205270250021">"Azikho izimvume ezinikiwe"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="4074220596273432442">"Azikho izimvume eziceliwe"</string>
+    <string name="storage_type_internal" msgid="8918688427078709570">"%s kusitoreji sangaphakathi"</string>
     <string name="data_usage_summary_title" msgid="4368024763485916986">"Ukusebenzisa idatha"</string>
     <string name="data_usage_app_summary_title" msgid="5012851696585421420">"Ukusetshenziswa kwedatha yohlelo lokusebenza"</string>
     <string name="computing_size" msgid="5791407621793083965">"Iyakhompyutha…"</string>
@@ -344,12 +346,7 @@
     <string name="location_settings_recent_requests_title" msgid="6345634382240930628">"Izicelo zakamuva zendawo"</string>
     <string name="location_settings_recent_requests_empty_message" msgid="7789667070033674910">"Azikho izicelo zakamuva zendawo"</string>
     <string name="location_settings_app_permissions_title" msgid="6446735313354321564">"Izimvume zeleveli yohlelo lokusebenza"</string>
-    <string name="location_settings_scanning_title" msgid="4253945869911300740">"Iyaskena"</string>
     <string name="location_settings_services_title" msgid="1186133632690970468">"Amasevisi endawo"</string>
-    <string name="location_settings_wifi_scanning_title" msgid="8021558840074023719">"Ukuskena kwe-Wi-Fi"</string>
-    <string name="location_settings_wifi_scanning_summary" msgid="2116283960258671324">"Vumela izinhlelo zokusebenza namasevisi ukuthi askenele amanethiwekhi e-Wi-Fi noma kunini, nanoma i-Wi-Fi ivaliwe. Lokhu kungasetshenziselwa, njengesibonelo, ukuthuthukisa izici ezisuselwa endaweni namasevisi."</string>
-    <string name="location_settings_bluetooth_scanning_title" msgid="2969682902241932059">"Ukuskena kwe-Bluetooth"</string>
-    <string name="location_settings_bluetooth_scanning_summary" msgid="9158101751700727062">"Vumela izinhlelo zokusebenza namasevisi ukuthi askenele amadivayisi aseduze noma kunini, nanoma i-Bluetooth ivaliwe. Lokhu kungasetshenziselwa, njengesibonelo, ukuthuthukisa izici ezisuselwa endaweni namasevisi."</string>
     <string name="system_setting_title" msgid="6864599341809463440">"Isistimu"</string>
     <string name="system_update_settings_title" msgid="8448588267784138855">"Izibuyekezo zesistimu"</string>
     <string name="firmware_version" msgid="8491753744549309333">"Inguqulo ye-Android"</string>
@@ -640,6 +637,11 @@
     <string name="trusted_device_fail_enrollment_toast" msgid="6801324174861209092">"Ukubhaliswa kwe-<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kwehlulekiile"</string>
     <string name="trusted_device_set_authentication_reminder" msgid="5947077589994822305">"Ukungeza idivayisi ethembekile kudinga ukuthi usethe indlela yokugunyaza elandelayo. Uma ungenayo idivayisi yakho ethembekile, ukugunyaza kuzodingeka ukufinyelela iphrofayela yakho."</string>
     <string name="trusted_device_disconnected_toast" msgid="2541862946536880255">"Idivayisi inqanyuliwe."</string>
+    <string name="credentials_reset" msgid="873900550885788639">"Sula ukuqinisekisa"</string>
+    <string name="credentials_reset_summary" msgid="6067911547500459637">"Susa zonke izitifiketi"</string>
+    <string name="credentials_reset_hint" msgid="3459271621754137661">"Susa konke okuqukethwe?"</string>
+    <string name="credentials_erased" msgid="2515915439705550379">"Isitoreji sokuqinisekisa sisuliwe."</string>
+    <string name="credentials_not_erased" msgid="6118567459076742720">"Isitoreji sokuqinisekisa asikwazanga ukususwa."</string>
     <string name="forget" msgid="3971143908183848527">"Khohlwa"</string>
     <string name="connect" msgid="5861699594602380150">"Xhuma"</string>
     <string name="disconnect" msgid="6140789953324820336">"Nqamula"</string>
@@ -655,6 +657,6 @@
     <string name="exit_retail_mode_dialog_body" msgid="8314316171782527301">"Lokhu kuzosusa i-akhawunti ye-demo futhi isethe kabusha idatha yesistimu. Yonke idatha yomsebenzisi izolahleka."</string>
     <string name="exit_retail_mode_dialog_confirmation_button_text" msgid="3147249675355968649">"Phuma kudemo"</string>
     <string name="suggestion_dismiss_button" msgid="4539412646977050641">"CASHISA"</string>
-    <string name="restricted_while_driving" msgid="6217369093121968299">"Isici asitholakali ngenkathi ushayela."</string>
-    <string name="add_user_restricted_while_driving" msgid="6384004350628271556">"Ayikwazi ukungeza umsebenzisi ngenkathi ushayela."</string>
+    <string name="restricted_while_driving" msgid="6587569249519274524">"Isici asitholakali ngenkathi ushayela"</string>
+    <string name="add_user_restricted_while_driving" msgid="4754946754222453656">"Ayikwazi ukungeza umsebenzisi omusha ngenkathi ushayela"</string>
 </resources>
diff --git a/res/values/preference_keys.xml b/res/values/preference_keys.xml
index ac6a56a..491a562 100644
--- a/res/values/preference_keys.xml
+++ b/res/values/preference_keys.xml
@@ -141,6 +141,9 @@
     <string name="pk_application_details_permissions" translatable="false">
         application_details_permissions
     </string>
+    <string name="pk_application_details_storage" translatable="false">
+        application_details_storage
+    </string>
     <string name="pk_application_details_version" translatable="false">
         application_details_version
     </string>
@@ -304,6 +307,7 @@
     <string name="pk_companion_app_download" translatable="false">companion_app_download</string>
     <string name="pk_trusted_device_safety_alert" translatable="false">trusted_device_safety_alert
     </string>
+    <string name="pk_credentials_reset" translatable="false">credentials_reset</string>
 
     <!-- System Settings -->
     <string name="pk_languages_and_input_settings" translatable="false">
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 922fbfa..1feb990 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -599,12 +599,16 @@
     <string name="permissions_label">Permissions</string>
     <!-- Label for the toggle that enables/disables an app's notifications. [CHAR LIMIT=20] -->
     <string name="notifications_label">Notifications</string>
+    <!-- Label that lead into individual application storage info screen -->
+    <string name="storage_application_label">Storage &amp; cache</string>
     <!-- Label for displaying application version. -->
     <string name="application_version_label">Version: %1$s</string>
     <!-- Runtime permissions preference summary, shown when the app has no permissions granted. [CHAR LIMIT=40] -->
     <string name="runtime_permissions_summary_no_permissions_granted">No permissions granted</string>
     <!-- Runtime permissions preference summary, shown when the app requests no permissions. [CHAR LIMIT=40] -->
     <string name="runtime_permissions_summary_no_permissions_requested">No permissions requested</string>
+    <!-- Application's internal storage size preference summary. [CHAR LIMIT=40] -->
+    <string name="storage_type_internal">%s in internal storage</string>
     <!-- Activity title for network data usage summary. [CHAR LIMIT=25] -->
     <string name="data_usage_summary_title">Data usage</string>
     <!-- Activity title for Appk data usage summary. [CHAR LIMIT=25] -->
@@ -1357,6 +1361,18 @@
     <!-- Toast shown when phone is disconnected [CHAR LIMIT=50]-->
     <string name="trusted_device_disconnected_toast">Device disconnected.</string>
 
+    <!-- security credentials --><skip/>
+    <!-- Title of preference to reset credential storage. [CHAR LIMIT=40] -->
+    <string name="credentials_reset">Clear credentials</string>
+    <!-- Summary of preference to reset credential storage. [CHAR LIMIT=NONE] -->
+    <string name="credentials_reset_summary">Remove all certificates</string>
+    <!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] -->
+    <string name="credentials_reset_hint">Remove all the contents?</string>
+    <!-- Toast message after credential storage is erased. [CHAR LIMIT=60] -->
+    <string name="credentials_erased">Credential storage is erased.</string>
+    <!-- Toast message when credential storage could not be erased. [CHAR LIMIT=60] -->
+    <string name="credentials_not_erased">Credential storage couldn\u2019t be erased.</string>
+
     <!-- generic --><skip/>
     <!-- Button label for generic forget action [CHAR LIMIT=20] -->
     <string name="forget">Forget</string>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 1b66204..1e7694b 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -58,6 +58,7 @@
         <item name="android:colorBackgroundCacheHint">@null</item>
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowAnimationStyle">@android:style/Animation</item>
+        <item name="android:windowIsFloating">true</item>
     </style>
 
     <!-- Themes for Setup Wizard -->
diff --git a/res/xml/application_details_fragment.xml b/res/xml/application_details_fragment.xml
index 75bf604..3084b14 100644
--- a/res/xml/application_details_fragment.xml
+++ b/res/xml/application_details_fragment.xml
@@ -32,6 +32,10 @@
         android:key="@string/pk_application_details_permissions"
         android:title="@string/permissions_label"
         settings:controller="com.android.car.settings.applications.PermissionsPreferenceController"/>
+    <Preference
+        android:key="@string/pk_application_details_storage"
+        android:title="@string/storage_application_label"
+        settings:controller="com.android.car.settings.applications.StoragePreferenceController"/>
     <com.android.car.ui.preference.CarUiPreference
         android:key="@string/pk_application_details_version"
         settings:controller="com.android.car.settings.applications.VersionPreferenceController"
diff --git a/res/xml/security_settings_fragment.xml b/res/xml/security_settings_fragment.xml
index b71d532..a096a93 100644
--- a/res/xml/security_settings_fragment.xml
+++ b/res/xml/security_settings_fragment.xml
@@ -34,4 +34,13 @@
         android:key="@string/pk_trusted_device"
         android:title="@string/trusted_device"
         settings:controller="com.android.car.settings.security.TrustedDeviceEntryPreferenceController"/>
-</PreferenceScreen>
\ No newline at end of file
+    <Preference
+        android:key="@string/pk_credentials_reset"
+        android:summary="@string/credentials_reset_summary"
+        android:title="@string/credentials_reset"
+        settings:controller="com.android.car.settings.security.CredentialsResetPreferenceController">
+        <intent
+            android:action="com.android.credentials.RESET"
+            android:targetPackage="com.android.car.settings"/>
+    </Preference>
+</PreferenceScreen>
diff --git a/src/com/android/car/settings/applications/ApplicationDetailsFragment.java b/src/com/android/car/settings/applications/ApplicationDetailsFragment.java
index 19ad516..5aca0b3 100644
--- a/src/com/android/car/settings/applications/ApplicationDetailsFragment.java
+++ b/src/com/android/car/settings/applications/ApplicationDetailsFragment.java
@@ -146,6 +146,9 @@
                 R.string.pk_application_details_notifications).setPackageInfo(mPackageInfo);
         use(PermissionsPreferenceController.class,
                 R.string.pk_application_details_permissions).setPackageName(mPackageName);
+        use(StoragePreferenceController.class,
+                R.string.pk_application_details_storage)
+                .setAppEntry(mAppEntry).setPackageName(mPackageName);
         use(VersionPreferenceController.class,
                 R.string.pk_application_details_version).setPackageInfo(mPackageInfo);
     }
diff --git a/src/com/android/car/settings/applications/StoragePreferenceController.java b/src/com/android/car/settings/applications/StoragePreferenceController.java
new file mode 100644
index 0000000..42633f5
--- /dev/null
+++ b/src/com/android/car/settings/applications/StoragePreferenceController.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2018 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.car.settings.applications;
+
+import android.car.drivingstate.CarUxRestrictions;
+import android.content.Context;
+
+import androidx.preference.Preference;
+
+import com.android.car.settings.R;
+import com.android.car.settings.common.FragmentController;
+import com.android.car.settings.common.PreferenceController;
+import com.android.car.settings.storage.AppStorageSettingsDetailsFragment;
+import com.android.settingslib.applications.ApplicationsState;
+
+/** Business logic for the storage entry in the application details settings. */
+public class StoragePreferenceController extends PreferenceController<Preference> {
+
+    private String mPackageName;
+    private ApplicationsState.AppEntry mAppEntry;
+
+    public StoragePreferenceController(Context context, String preferenceKey,
+            FragmentController fragmentController, CarUxRestrictions uxRestrictions) {
+        super(context, preferenceKey, fragmentController, uxRestrictions);
+    }
+
+    @Override
+    protected Class<Preference> getPreferenceType() {
+        return Preference.class;
+    }
+
+    /** Sets the {@link ApplicationsState.AppEntry} which is used to load the app size. */
+    public StoragePreferenceController setAppEntry(ApplicationsState.AppEntry appEntry) {
+        mAppEntry = appEntry;
+        return this;
+    }
+    /**
+     * Set the packageName, which is used to open the AppStorageSettingsDetailsFragment
+     */
+    public StoragePreferenceController setPackageName(String packageName) {
+        mPackageName = packageName;
+        return this;
+    }
+
+    @Override
+    protected void checkInitialized() {
+        if (mAppEntry == null || mPackageName == null) {
+            throw new IllegalStateException(
+                    "AppEntry and PackageName should be set before calling this function");
+        }
+    }
+
+    @Override
+    protected void updateState(Preference preference) {
+        preference.setSummary(
+                getContext().getString(R.string.storage_type_internal, mAppEntry.sizeStr));
+    }
+
+    @Override
+    protected boolean handlePreferenceClicked(Preference preference) {
+        getFragmentController().launchFragment(
+                AppStorageSettingsDetailsFragment.getInstance(mPackageName));
+        return true;
+    }
+}
diff --git a/src/com/android/car/settings/common/FragmentResolver.java b/src/com/android/car/settings/common/FragmentResolver.java
index 8678281..594d94f 100644
--- a/src/com/android/car/settings/common/FragmentResolver.java
+++ b/src/com/android/car/settings/common/FragmentResolver.java
@@ -19,6 +19,7 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.net.wifi.WifiManager;
+import android.os.storage.StorageManager;
 import android.provider.Settings;
 import android.text.TextUtils;
 
@@ -44,6 +45,7 @@
 import com.android.car.settings.network.MobileNetworkFragment;
 import com.android.car.settings.network.NetworkAndInternetFragment;
 import com.android.car.settings.quicksettings.QuickSettingFragment;
+import com.android.car.settings.security.SecuritySettingsFragment;
 import com.android.car.settings.sound.SoundSettingsFragment;
 import com.android.car.settings.storage.StorageSettingsFragment;
 import com.android.car.settings.system.AboutSettingsFragment;
@@ -157,8 +159,12 @@
                 return new AccountSettingsFragment();
 
             case Settings.ACTION_INTERNAL_STORAGE_SETTINGS:
+            case StorageManager.ACTION_MANAGE_STORAGE:
                 return new StorageSettingsFragment();
 
+            case Settings.ACTION_SECURITY_SETTINGS:
+                return new SecuritySettingsFragment();
+
             case Settings.ACTION_LOCALE_SETTINGS:
                 return new LanguagePickerFragment();
 
diff --git a/src/com/android/car/settings/location/LocationServicesPreferenceController.java b/src/com/android/car/settings/location/LocationServicesPreferenceController.java
index b17fb20..1c9b04a 100644
--- a/src/com/android/car/settings/location/LocationServicesPreferenceController.java
+++ b/src/com/android/car/settings/location/LocationServicesPreferenceController.java
@@ -70,15 +70,6 @@
         return PreferenceGroup.class;
     }
 
-    @Override
-    protected void onCreateInternal() {
-        int profileId = UserHandle.USER_CURRENT;
-        List<Preference> injectedSettings = getSortedInjectedPreferences(profileId);
-        for (Preference preference : injectedSettings) {
-            getPreference().addPreference(preference);
-        }
-    }
-
     /**
      * Called when the controller is started.
      */
@@ -97,6 +88,11 @@
 
     @Override
     protected void updateState(PreferenceGroup preferenceGroup) {
+        getPreference().removeAll();
+        List<Preference> injectedSettings = getSortedInjectedPreferences(UserHandle.USER_CURRENT);
+        for (Preference preference : injectedSettings) {
+            getPreference().addPreference(preference);
+        }
 
         preferenceGroup.setVisible(preferenceGroup.getPreferenceCount() > 0);
     }
diff --git a/src/com/android/car/settings/network/MobileNetworkFragment.java b/src/com/android/car/settings/network/MobileNetworkFragment.java
index 9ad6085..29ade11 100644
--- a/src/com/android/car/settings/network/MobileNetworkFragment.java
+++ b/src/com/android/car/settings/network/MobileNetworkFragment.java
@@ -113,10 +113,8 @@
             // It is possible for this to be called before the activity is fully created. If so,
             // cache the value so that it can be constructed onActivityCreated.
             mTitle = info.getDisplayName();
-            try {
+            if (getToolbar() != null) {
                 getToolbar().setTitle(mTitle);
-            } catch (IllegalArgumentException ex) {
-                // Toolbar is not found since the activity is not loaded yet. Continue.
             }
         }
     }
diff --git a/src/com/android/car/settings/quicksettings/QuickSettingGridAdapter.java b/src/com/android/car/settings/quicksettings/QuickSettingGridAdapter.java
index 412c3bd..b3e8a19 100644
--- a/src/com/android/car/settings/quicksettings/QuickSettingGridAdapter.java
+++ b/src/com/android/car/settings/quicksettings/QuickSettingGridAdapter.java
@@ -149,8 +149,6 @@
         for (Tile tile : mTiles) {
             tile.stop();
         }
-        mTiles.clear();
-        mSeekbarTiles.clear();
     }
 
     @Override
diff --git a/src/com/android/car/settings/security/CredentialStorageActivity.java b/src/com/android/car/settings/security/CredentialStorageActivity.java
new file mode 100644
index 0000000..e9d49d7
--- /dev/null
+++ b/src/com/android/car/settings/security/CredentialStorageActivity.java
@@ -0,0 +1,350 @@
+/*
+ * Copyright 2019 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.car.settings.security;
+
+import android.app.Activity;
+import android.car.userlib.CarUserManagerHelper;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.UserInfo;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.os.Process;
+import android.os.RemoteException;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.security.Credentials;
+import android.security.KeyChain;
+import android.security.KeyStore;
+import android.text.TextUtils;
+import android.widget.Toast;
+
+import androidx.annotation.Nullable;
+import androidx.fragment.app.FragmentActivity;
+
+import com.android.car.settings.R;
+import com.android.car.settings.common.ConfirmationDialogFragment;
+import com.android.car.settings.common.Logger;
+import com.android.internal.widget.LockPatternUtils;
+
+import java.lang.ref.WeakReference;
+
+/**
+ * Handles resetting and installing keys into {@link KeyStore}. Only Settings and the CertInstaller
+ * application are permitted to perform the install action.
+ */
+public class CredentialStorageActivity extends FragmentActivity {
+
+    private static final Logger LOG = new Logger(CredentialStorageActivity.class);
+
+    private static final String ACTION_INSTALL = "com.android.credentials.INSTALL";
+    private static final String ACTION_RESET = "com.android.credentials.RESET";
+
+    private static final String DIALOG_TAG = "com.android.car.settings.security.RESET_CREDENTIALS";
+    private static final String CERT_INSTALLER_PKG = "com.android.certinstaller";
+
+    private static final int CONFIRM_CLEAR_SYSTEM_CREDENTIAL_REQUEST = 1;
+
+    private final KeyStore mKeyStore = KeyStore.getInstance();
+
+    private CarUserManagerHelper mCarUserManagerHelper;
+    private LockPatternUtils mUtils;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mCarUserManagerHelper = new CarUserManagerHelper(this);
+        mUtils = new LockPatternUtils(this);
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+
+        if (isFinishing()) {
+            return;
+        }
+
+        if (mCarUserManagerHelper.isCurrentProcessUserHasRestriction(
+                UserManager.DISALLOW_CONFIG_CREDENTIALS)) {
+            finish();
+            return;
+        }
+
+        Intent intent = getIntent();
+        String action = intent.getAction();
+        if (ACTION_RESET.equals(action)) {
+            showResetConfirmationDialog();
+        } else if (ACTION_INSTALL.equals(action) && checkCallerIsCertInstallerOrSelfInProfile()) {
+            Bundle installBundle = intent.getExtras();
+            boolean allTasksComplete = installIfAvailable(installBundle);
+            if (allTasksComplete) {
+                finish();
+            }
+        }
+    }
+
+    private void showResetConfirmationDialog() {
+        ConfirmationDialogFragment dialog = new ConfirmationDialogFragment.Builder(this)
+                .setTitle(R.string.credentials_reset)
+                .setMessage(R.string.credentials_reset_hint)
+                .setPositiveButton(android.R.string.ok, arguments -> onResetConfirmed())
+                .setNegativeButton(android.R.string.cancel, arguments -> finish())
+                .build();
+        dialog.show(getSupportFragmentManager(), DIALOG_TAG);
+    }
+
+    private void onResetConfirmed() {
+        if (!mUtils.isSecure(mCarUserManagerHelper.getCurrentProcessUserId())) {
+            new ResetKeyStoreAndKeyChain(this).execute();
+        } else {
+            startActivityForResult(new Intent(this, CheckLockActivity.class),
+                    CONFIRM_CLEAR_SYSTEM_CREDENTIAL_REQUEST);
+        }
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == CONFIRM_CLEAR_SYSTEM_CREDENTIAL_REQUEST) {
+            if (resultCode == Activity.RESULT_OK) {
+                new ResetKeyStoreAndKeyChain(this).execute();
+            } else {
+                finish();
+            }
+        }
+    }
+
+    /**
+     * Check that the caller is either CertInstaller or Settings running in a profile of this user.
+     */
+    private boolean checkCallerIsCertInstallerOrSelfInProfile() {
+        if (TextUtils.equals(CERT_INSTALLER_PKG, getCallingPackage())) {
+            // CertInstaller is allowed to install credentials if it has the same signature as
+            // Settings package.
+            return getPackageManager().checkSignatures(getCallingPackage(), getPackageName())
+                    == PackageManager.SIGNATURE_MATCH;
+        }
+
+        int launchedFromUserId;
+        try {
+            int launchedFromUid = android.app.ActivityManager.getService().getLaunchedFromUid(
+                    getActivityToken());
+            if (launchedFromUid == -1) {
+                LOG.e(ACTION_INSTALL + " must be started with startActivityForResult");
+                return false;
+            }
+            if (!UserHandle.isSameApp(launchedFromUid, Process.myUid())) {
+                return false;
+            }
+            launchedFromUserId = UserHandle.getUserId(launchedFromUid);
+        } catch (RemoteException e) {
+            LOG.w("Unable to verify calling identity. ActivityManager is down.", e);
+            return false;
+        }
+
+        UserManager userManager = (UserManager) getSystemService(Context.USER_SERVICE);
+        UserInfo parentInfo = userManager.getProfileParent(launchedFromUserId);
+        // Caller is running in a profile of this user
+        return ((parentInfo != null) && (parentInfo.id
+                == mCarUserManagerHelper.getCurrentProcessUserId()));
+    }
+
+    /**
+     * Install credentials if available, otherwise do nothing.
+     *
+     * @return {@code true} if the installation is done and the activity should be finished, {@code
+     * false} if an asynchronous task is pending and will finish the activity when it's done.
+     */
+    private boolean installIfAvailable(Bundle installBundle) {
+        if (installBundle == null || installBundle.isEmpty()) {
+            return true;
+        }
+
+        int uid = installBundle.getInt(Credentials.EXTRA_INSTALL_AS_UID, KeyStore.UID_SELF);
+
+        if (uid != KeyStore.UID_SELF && !UserHandle.isSameUser(uid, Process.myUid())) {
+            int dstUserId = UserHandle.getUserId(uid);
+
+            // Restrict install target to the wifi uid.
+            if (uid != Process.WIFI_UID) {
+                LOG.e("Failed to install credentials as uid " + uid
+                        + ": cross-user installs may only target wifi uids");
+                return true;
+            }
+
+            Intent installIntent = new Intent(ACTION_INSTALL)
+                    .setFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT)
+                    .putExtras(installBundle);
+            startActivityAsUser(installIntent, new UserHandle(dstUserId));
+            return true;
+        }
+
+        boolean shouldFinish = true;
+        if (installBundle.containsKey(Credentials.EXTRA_USER_PRIVATE_KEY_NAME)) {
+            String key = installBundle.getString(Credentials.EXTRA_USER_PRIVATE_KEY_NAME);
+            byte[] value = installBundle.getByteArray(Credentials.EXTRA_USER_PRIVATE_KEY_DATA);
+
+            if (!mKeyStore.importKey(key, value, uid, KeyStore.FLAG_NONE)) {
+                LOG.e("Failed to install " + key + " as uid " + uid);
+                return true;
+            }
+            // The key was prepended USER_PRIVATE_KEY by the CredentialHelper. However,
+            // KeyChain internally uses the raw alias name and only prepends USER_PRIVATE_KEY
+            // to the key name when interfacing with KeyStore.
+            // This is generally a symptom of CredentialStorage and CredentialHelper relying
+            // on internal implementation details of KeyChain and imitating its functionality
+            // rather than delegating to KeyChain for the certificate installation.
+            if (uid == Process.SYSTEM_UID || uid == KeyStore.UID_SELF) {
+                new MarkKeyAsUserSelectable(this,
+                        key.replaceFirst("^" + Credentials.USER_PRIVATE_KEY, "")).execute();
+                shouldFinish = false;
+            }
+        }
+
+        int flags = KeyStore.FLAG_NONE;
+
+        if (installBundle.containsKey(Credentials.EXTRA_USER_CERTIFICATE_NAME)) {
+            String certName = installBundle.getString(Credentials.EXTRA_USER_CERTIFICATE_NAME);
+            byte[] certData = installBundle.getByteArray(Credentials.EXTRA_USER_CERTIFICATE_DATA);
+
+            if (!mKeyStore.put(certName, certData, uid, flags)) {
+                LOG.e("Failed to install " + certName + " as uid " + uid);
+                return shouldFinish;
+            }
+        }
+
+        if (installBundle.containsKey(Credentials.EXTRA_CA_CERTIFICATES_NAME)) {
+            String caListName = installBundle.getString(Credentials.EXTRA_CA_CERTIFICATES_NAME);
+            byte[] caListData = installBundle.getByteArray(Credentials.EXTRA_CA_CERTIFICATES_DATA);
+
+            if (!mKeyStore.put(caListName, caListData, uid, flags)) {
+                LOG.e("Failed to install " + caListName + " as uid " + uid);
+                return shouldFinish;
+            }
+        }
+
+        sendBroadcast(new Intent(KeyChain.ACTION_KEYCHAIN_CHANGED));
+        setResult(RESULT_OK);
+        return shouldFinish;
+    }
+
+    /**
+     * Background task to handle reset of both {@link KeyStore} and user installed CAs.
+     */
+    private static class ResetKeyStoreAndKeyChain extends AsyncTask<Void, Void, Boolean> {
+
+        private final WeakReference<CredentialStorageActivity> mCredentialStorage;
+
+        ResetKeyStoreAndKeyChain(CredentialStorageActivity credentialStorage) {
+            mCredentialStorage = new WeakReference<>(credentialStorage);
+        }
+
+        @Override
+        protected Boolean doInBackground(Void... unused) {
+            CredentialStorageActivity credentialStorage = mCredentialStorage.get();
+            if (credentialStorage == null || credentialStorage.isFinishing()
+                    || credentialStorage.isDestroyed()) {
+                return false;
+            }
+
+            credentialStorage.mUtils.resetKeyStore(
+                    credentialStorage.mCarUserManagerHelper.getCurrentProcessUserId());
+
+            try {
+                KeyChain.KeyChainConnection keyChainConnection = KeyChain.bind(credentialStorage);
+                try {
+                    return keyChainConnection.getService().reset();
+                } catch (RemoteException e) {
+                    LOG.w("Failed to reset KeyChain", e);
+                    return false;
+                } finally {
+                    keyChainConnection.close();
+                }
+            } catch (InterruptedException e) {
+                LOG.w("Failed to reset KeyChain", e);
+                Thread.currentThread().interrupt();
+                return false;
+            }
+        }
+
+        @Override
+        protected void onPostExecute(Boolean success) {
+            CredentialStorageActivity credentialStorage = mCredentialStorage.get();
+            if (credentialStorage == null || credentialStorage.isFinishing()
+                    || credentialStorage.isDestroyed()) {
+                return;
+            }
+            if (success) {
+                Toast.makeText(credentialStorage, R.string.credentials_erased,
+                        Toast.LENGTH_SHORT).show();
+            } else {
+                Toast.makeText(credentialStorage, R.string.credentials_not_erased,
+                        Toast.LENGTH_SHORT).show();
+            }
+            credentialStorage.finish();
+        }
+    }
+
+    /**
+     * Background task to mark a given key alias as user-selectable so that it can be selected by
+     * users from the Certificate Selection prompt.
+     */
+    private static class MarkKeyAsUserSelectable extends AsyncTask<Void, Void, Boolean> {
+
+        private final WeakReference<CredentialStorageActivity> mCredentialStorage;
+        private final String mAlias;
+
+        MarkKeyAsUserSelectable(CredentialStorageActivity credentialStorage, String alias) {
+            mCredentialStorage = new WeakReference<>(credentialStorage);
+            mAlias = alias;
+        }
+
+        @Override
+        protected Boolean doInBackground(Void... unused) {
+            CredentialStorageActivity credentialStorage = mCredentialStorage.get();
+            if (credentialStorage == null || credentialStorage.isFinishing()
+                    || credentialStorage.isDestroyed()) {
+                return false;
+            }
+            try (KeyChain.KeyChainConnection keyChainConnection = KeyChain.bind(
+                    credentialStorage)) {
+                keyChainConnection.getService().setUserSelectable(mAlias, true);
+                return true;
+            } catch (RemoteException e) {
+                LOG.w("Failed to mark key " + mAlias + " as user-selectable.", e);
+                return false;
+            } catch (InterruptedException e) {
+                LOG.w("Failed to mark key " + mAlias + " as user-selectable.", e);
+                Thread.currentThread().interrupt();
+                return false;
+            }
+        }
+
+        @Override
+        protected void onPostExecute(Boolean result) {
+            LOG.i(String.format("Marked alias %s as selectable, success? %s", mAlias, result));
+            CredentialStorageActivity credentialStorage = mCredentialStorage.get();
+            if (credentialStorage == null || credentialStorage.isFinishing()
+                    || credentialStorage.isDestroyed()) {
+                return;
+            }
+            credentialStorage.finish();
+        }
+    }
+}
diff --git a/src/com/android/car/settings/security/CredentialsResetPreferenceController.java b/src/com/android/car/settings/security/CredentialsResetPreferenceController.java
new file mode 100644
index 0000000..b3460f3
--- /dev/null
+++ b/src/com/android/car/settings/security/CredentialsResetPreferenceController.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2019 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.car.settings.security;
+
+import static android.os.UserManager.DISALLOW_CONFIG_CREDENTIALS;
+
+import android.car.drivingstate.CarUxRestrictions;
+import android.car.userlib.CarUserManagerHelper;
+import android.content.Context;
+
+import androidx.preference.Preference;
+
+import com.android.car.settings.common.FragmentController;
+import com.android.car.settings.common.PreferenceController;
+
+/** Controls whether the option to reset credentials is shown to the user. */
+public class CredentialsResetPreferenceController extends PreferenceController<Preference> {
+
+    private final CarUserManagerHelper mCarUserManagerHelper;
+
+    public CredentialsResetPreferenceController(Context context, String preferenceKey,
+            FragmentController fragmentController, CarUxRestrictions uxRestrictions) {
+        super(context, preferenceKey, fragmentController, uxRestrictions);
+        mCarUserManagerHelper = new CarUserManagerHelper(context);
+    }
+
+    @Override
+    protected Class<Preference> getPreferenceType() {
+        return Preference.class;
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return mCarUserManagerHelper.isCurrentProcessUserHasRestriction(DISALLOW_CONFIG_CREDENTIALS)
+                ? DISABLED_FOR_USER : AVAILABLE;
+    }
+}
diff --git a/tests/robotests/src/com/android/car/settings/location/LocationServicesPreferenceControllerTest.java b/tests/robotests/src/com/android/car/settings/location/LocationServicesPreferenceControllerTest.java
index 65e8527..3efe1ca 100644
--- a/tests/robotests/src/com/android/car/settings/location/LocationServicesPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/car/settings/location/LocationServicesPreferenceControllerTest.java
@@ -74,16 +74,6 @@
     }
 
     @Test
-    public void onCreate_addsInjectedSettingsToPreferenceCategory() {
-        Map<Integer, List<Preference>> samplePrefs = getSamplePreferences();
-        doReturn(samplePrefs).when(mSettingsInjector)
-                .getInjectedSettings(any(Context.class), anyInt());
-        mControllerHelper.sendLifecycleEvent(Lifecycle.Event.ON_CREATE);
-
-        assertThat(mCategory.getPreferenceCount()).isEqualTo(samplePrefs.get(PROFILE_ID).size());
-    }
-
-    @Test
     public void onStart_registersBroadcastReceiver() {
         mControllerHelper.sendLifecycleEvent(Lifecycle.Event.ON_START);
         mContext.sendBroadcast(new Intent(SettingInjectorService.ACTION_INJECTED_SETTING_CHANGED));
@@ -103,6 +93,32 @@
     }
 
     @Test
+    public void updateState_addsInjectedSettingsToPreferenceCategory() {
+        mControllerHelper.sendLifecycleEvent(Lifecycle.Event.ON_START);
+        Map<Integer, List<Preference>> samplePrefs = getSamplePreferences();
+        doReturn(samplePrefs).when(mSettingsInjector)
+                .getInjectedSettings(any(Context.class), anyInt());
+
+        mController.updateState(mCategory);
+
+        assertThat(mCategory.getPreferenceCount()).isEqualTo(samplePrefs.get(PROFILE_ID).size());
+    }
+
+    @Test
+    public void updateState_updatesPreferenceSummary() {
+        Map<Integer, List<Preference>> samplePrefs = getSamplePreferences();
+        doReturn(samplePrefs).when(mSettingsInjector)
+                .getInjectedSettings(any(Context.class), anyInt());
+        mControllerHelper.sendLifecycleEvent(Lifecycle.Event.ON_START);
+        String summary = "Summary";
+        samplePrefs.get(PROFILE_ID).get(0).setSummary(summary);
+
+        mController.updateState(mCategory);
+
+        assertThat(mCategory.getPreference(0).getSummary()).isEqualTo(summary);
+    }
+
+    @Test
     public void preferenceCategory_isVisibleIfThereAreInjectedSettings() {
         doReturn(getSamplePreferences()).when(mSettingsInjector)
                 .getInjectedSettings(any(Context.class), anyInt());
diff --git a/tests/robotests/src/com/android/car/settings/security/CredentialsResetPreferenceControllerTest.java b/tests/robotests/src/com/android/car/settings/security/CredentialsResetPreferenceControllerTest.java
new file mode 100644
index 0000000..e263973
--- /dev/null
+++ b/tests/robotests/src/com/android/car/settings/security/CredentialsResetPreferenceControllerTest.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2019 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.car.settings.security;
+
+import static com.android.car.settings.common.PreferenceController.AVAILABLE;
+import static com.android.car.settings.common.PreferenceController.DISABLED_FOR_USER;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.when;
+
+import android.car.userlib.CarUserManagerHelper;
+import android.content.Context;
+import android.os.UserManager;
+
+import androidx.preference.Preference;
+
+import com.android.car.settings.common.PreferenceControllerTestHelper;
+import com.android.car.settings.testutils.ShadowCarUserManagerHelper;
+
+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.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+/** Unit test for {@link CredentialsResetPreferenceController}. */
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = {ShadowCarUserManagerHelper.class})
+public class CredentialsResetPreferenceControllerTest {
+
+    @Mock
+    private CarUserManagerHelper mCarUserManagerHelper;
+
+    private PreferenceControllerTestHelper<CredentialsResetPreferenceController> mControllerHelper;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        ShadowCarUserManagerHelper.setMockInstance(mCarUserManagerHelper);
+
+        Context context = RuntimeEnvironment.application;
+        mControllerHelper = new PreferenceControllerTestHelper<>(context,
+                CredentialsResetPreferenceController.class, new Preference(context));
+    }
+
+    @After
+    public void tearDown() {
+        ShadowCarUserManagerHelper.reset();
+    }
+
+    @Test
+    public void getAvailabilityStatus_noRestrictions_returnsAvailable() {
+        when(mCarUserManagerHelper.isCurrentProcessUserHasRestriction(
+                UserManager.DISALLOW_CONFIG_CREDENTIALS)).thenReturn(false);
+
+        assertThat(mControllerHelper.getController().getAvailabilityStatus()).isEqualTo(AVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_userRestricted_returnsDisabledForUser() {
+        when(mCarUserManagerHelper.isCurrentProcessUserHasRestriction(
+                UserManager.DISALLOW_CONFIG_CREDENTIALS)).thenReturn(true);
+
+        assertThat(mControllerHelper.getController().getAvailabilityStatus()).isEqualTo(
+                DISABLED_FOR_USER);
+    }
+}