Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am: a7d4ead252 am: 38c77c1443 am: 80fa64f36f am: 27602cefb4 am: 921fe1ae4d am: 29c7538644 am: 5be57758c0 am: 784ae49eb5 am: 3fdb2ab38c am: 7aeb11db61
am: 1c27289895

* commit '1c27289895098e727484c44e2032a2d71c9f6325':
diff --git a/Android.mk b/Android.mk
index 286b73f..0ae2461 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,28 +1,6 @@
 LOCAL_PATH:= $(call my-dir)
 
 ########################################
-# NXP Configuration
-########################################
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := \
-        $(call all-java-files-under, src)
-
-LOCAL_SRC_FILES += \
-        $(call all-java-files-under, nxp)
-
-LOCAL_PACKAGE_NAME := Nfc
-LOCAL_CERTIFICATE := platform
-
-LOCAL_JNI_SHARED_LIBRARIES  := libnfc_jni
-
-LOCAL_PROGUARD_ENABLED := disabled
-
-include $(BUILD_PACKAGE)
-
-########################################
 # NCI Configuration
 ########################################
 include $(CLEAR_VARS)
@@ -36,7 +14,6 @@
         $(call all-java-files-under, nci)
 
 LOCAL_PACKAGE_NAME := NfcNci
-LOCAL_OVERRIDES_PACKAGES := Nfc
 LOCAL_CERTIFICATE := platform
 
 LOCAL_JNI_SHARED_LIBRARIES := libnfc_nci_jni
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 690a4f5..9941c53 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -49,7 +49,9 @@
     <uses-permission android:name="android.permission.SET_ACTIVITY_WATCHER" />
     <uses-permission android:name="android.permission.CONNECTIVITY_INTERNAL" />
     <uses-permission android:name="android.permission.NFC_HANDOVER_STATUS" />
+    <uses-permission android:name="android.permission.LOCAL_MAC_ADDRESS" />
     <uses-permission android:name="com.android.permission.WHITELIST_BLUETOOTH_DEVICE" />
+    <uses-permission android:name="android.permission.DISPATCH_NFC_MESSAGE" />
     <application android:name=".NfcApplication"
                  android:icon="@drawable/icon"
                  android:label="@string/app_name"
@@ -57,6 +59,7 @@
                  android:persistent="true"
                  android:backupAgent="com.android.nfc.NfcBackupAgent"
                  android:killAfterRestore="false"
+                 android:usesCleartextTraffic="false"
     >
         <meta-data android:name="com.google.android.backup.api_key"
             android:value="AEdPqrEAAAAIbiKKs0wlimxeJ9y8iRIaBOH6aeb2IurmZyBHvg" />
@@ -103,7 +106,7 @@
 
         <activity android:name=".BeamShareActivity"
             android:finishOnCloseSystemDialogs="true"
-            android:theme="@android:style/Theme.NoDisplay"
+            android:theme="@android:style/Theme.Translucent"
             android:label="@string/android_beam"
             android:noHistory="true"
             android:excludeFromRecents="true">
diff --git a/nxp/jni/Android.mk b/nxp/jni/Android.mk
index 607c664..c0e23db 100644
--- a/nxp/jni/Android.mk
+++ b/nxp/jni/Android.mk
@@ -33,4 +33,8 @@
 LOCAL_MODULE := libnfc_jni
 LOCAL_MODULE_TAGS := optional
 
-include $(BUILD_SHARED_LIBRARY)
+# !!! Intentionally commented out, we'll stop building
+# the NXP stack in M, code will be removed in the
+# next release.
+# include $(BUILD_SHARED_LIBRARY)
+# !!!
diff --git a/res/values-af/provisioning.xml b/res/values-af/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-af/provisioning.xml
+++ b/res/values-af/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 50fb03a..12139c7 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"Raak om te bekyk"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Die ontvanger se toestel ondersteun nie groot lêeroordrag via \'n straal nie."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Bring toestelle weer bymekaar"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"Koppel tans"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"Gekoppel"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"Kon nie koppel nie"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"Ontkoppel tans"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"Ontkoppel"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"Saambinding"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"Kon nie saambind nie"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Straal is tans besig. Probeer weer wanneer die vorige oordrag voltooid is."</string>
+    <string name="device" msgid="4459621591392478151">"toestel"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"Koppel tans <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"Het <xliff:g id="DEVICE_NAME">%1$s</xliff:g> gekoppel"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"Kon nie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> koppel nie"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"Ontkoppel tans <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"Het <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ontkoppel"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"Bind tans <xliff:g id="DEVICE_NAME">%1$s</xliff:g> saam"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"Kon nie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> saambind nie"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"Kon nie Bluetooth aktiveer nie"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"Is jy seker jy wil die Bluetooth-toestel, <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, saambind?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"Ja"</string>
@@ -42,8 +44,6 @@
     <string name="status_wifi_connected" msgid="5893022897732105739">"Gekoppel"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"Koppel aan netwerk"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"Koppel aan die netwerk <xliff:g id="NETWORK_SSID">%1$s</xliff:g>?"</string>
-    <!-- no translation found for beam_requires_nfc_enabled (2800366967218600534) -->
-    <skip />
-    <!-- no translation found for beam_requires_beam_enabled (5620935068991096814) -->
-    <skip />
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android Straal vereis dat NFC geaktiveer moet wees. Wil jy dit aktiveer?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Straal"</string>
 </resources>
diff --git a/res/values-am/provisioning.xml b/res/values-am/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-am/provisioning.xml
+++ b/res/values-am/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index ae4c107..49cd2af 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"ለማየት ንካ"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"የተቀባዩ መሣሪያ ትልቅ ፋይል በሞገድ በኩል ማስተላለፍ አይደግፍም።"</string>
     <string name="beam_try_again" msgid="3364677301009783455">"መሣሪያዎችን ዳግም አንድ ላይ አሰባስብ"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"በመገናኘት ላይ"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"ተገናኝቷል"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"ማገናኘት አልተቻለም"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"ግንኙነት በማቋረጥ ላይ"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"ግንኙነት ተቋርጧል"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"በማጣመር ላይ"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"ማጣመር አልተቻለም"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Beam አሁን ላይ ባተሌ ነው። ቀዳሚው ዝውውር ሲጠናቀቅ እንደገና ይሞክሩ።"</string>
+    <string name="device" msgid="4459621591392478151">"መሣሪያ"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>ን በማገናኘት ላይ"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ተገናኝቷል"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>ን ማገናኘት አልተቻለም"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"የ<xliff:g id="DEVICE_NAME">%1$s</xliff:g>ን ግንኙነት በማቋረጥ ላይ"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"የ<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ግንኙነት ተቋርጧል"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>ን በማጣመር ላይ"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>ን ማጣመር አልተቻለም"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"ብሉቱዝ ማንቃት አልተቻለም"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"እርግጠኛ ንዎት የብሉቱዝ መሣሪያው <xliff:g id="DEVICE_NAME">%1$s</xliff:g>ን ማጣመር ይፈልጋሉ?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"አዎ"</string>
@@ -42,8 +44,6 @@
     <string name="status_wifi_connected" msgid="5893022897732105739">"ተገናኝቷል"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"ከአውታረ መረብ ጋር አገናኝ"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"ከ<xliff:g id="NETWORK_SSID">%1$s</xliff:g> አውታረ መረብ ጋር ይገናኙ?"</string>
-    <!-- no translation found for beam_requires_nfc_enabled (2800366967218600534) -->
-    <skip />
-    <!-- no translation found for beam_requires_beam_enabled (5620935068991096814) -->
-    <skip />
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android Beam ኤንኤፍሲ እንዲነቃ ይጠይቃል። ሊያነቁት ይፈልጋሉ?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
 </resources>
diff --git a/res/values-ar/provisioning.xml b/res/values-ar/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-ar/provisioning.xml
+++ b/res/values-ar/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index d4c8b22..1e5db50 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"المس ليتم العرض"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"جهاز المستلم لا يوفر نقل ملفات كبيرة عبر تبادل البيانات."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"تجميع الأجهزة معًا من جديد"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"جارٍ الاتصال..."</string>
-    <string name="connected_headset" msgid="4047751837023241955">"متصل"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"تعذر الاتصال"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"جارٍ قطع الاتصال"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"غير متصل"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"جارٍ الإقران..."</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"تعذر الإقران"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"الشعاع مشغول حاليًا. يمكنك إعادة المحاولة عند اكتمال عملية النقل السابقة."</string>
+    <string name="device" msgid="4459621591392478151">"جهاز"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"جارٍ الاتصال بـ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"تم الاتصال بـ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"تعذر الاتصال بـ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"جارٍ إلغاء الاتصال بـ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"تم إلغاء الاتصال بـ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"جارٍ إقران <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"تعذر إقران <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"تعذر تمكين بلوتوث"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"هل تريد بالتأكيد إقران جهاز بلوتوث <xliff:g id="DEVICE_NAME">%1$s</xliff:g>؟"</string>
     <string name="pair_yes" msgid="3525614878559994448">"نعم"</string>
@@ -42,8 +44,6 @@
     <string name="status_wifi_connected" msgid="5893022897732105739">"تم الاتصال"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"الاتصال بالشبكة"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"هل تريد الاتصال بالشبكة <xliff:g id="NETWORK_SSID">%1$s</xliff:g>؟"</string>
-    <!-- no translation found for beam_requires_nfc_enabled (2800366967218600534) -->
-    <skip />
-    <!-- no translation found for beam_requires_beam_enabled (5620935068991096814) -->
-    <skip />
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"‏يتطلب شعاع Android تمكين ميزة NFC. هل تريد تمكينها؟"</string>
+    <string name="android_beam" msgid="1666446406999492763">"‏شعاع Android"</string>
 </resources>
diff --git a/res/values-az-rAZ/provisioning.xml b/res/values-az-rAZ/provisioning.xml
new file mode 100644
index 0000000..676cad9
--- /dev/null
+++ b/res/values-az-rAZ/provisioning.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2013 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.
+ -->
+
+<!--  NFC resources that may need to be customized
+     for different hardware or product builds.  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="provisioning_mime_types">
+    <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
+  </string-array>
+</resources>
diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml
index b1071ae..0fc6031 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-az-rAZ/strings.xml
@@ -18,15 +18,32 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"Görüntüləmək üçün toxunun"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Qəbul edənin cihazı beam vasitəsilə böyük fayl ötürülməsini dəstəkləmir."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Cihazları yenidən bir yerə gətir"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"Qoşulur..."</string>
-    <string name="connected_headset" msgid="4047751837023241955">"Qoşulu"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"Qoşula bilmədi"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"Əlaqə kəsilir"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"Əlaqə kəsilib"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"Qoşalama"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"Qoşalaya bilmədi"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Beam hazırda məşğuldur. Əvvəlki ötürmə tamamlandıqda yenidən cəhd edin."</string>
+    <string name="device" msgid="4459621591392478151">"cihaz"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> cihazına qoşulur"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> cihazına qoşulub"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> cihazına qoşula bilmədi"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> cihazından ayrılır"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> cihazından ayrıldı"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> cütləşir"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ilə cütləşə bilmir"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"Bluetooth aktiv edilə bilmədi"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> Bluetooth cihazını qoşalamaq istədiyinizdən əminsiniz?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"Bəli"</string>
     <string name="pair_no" msgid="5022308368904055020">"Xeyr"</string>
+    <string name="tap_again_to_pay" msgid="5754988005412859897">"<xliff:g id="APP">%1$s</xliff:g> Tətbiqi ilə ödəmək üçün yenidən tıklayın"</string>
+    <string name="tap_again_to_complete" msgid="5423640945118279123">"<xliff:g id="APP">%1$s</xliff:g> Tətbiqi ilə tamamlamaq üçün tıklayın"</string>
+    <string name="transaction_failure" msgid="7828102078637936513">"Bu əməliyyat <xliff:g id="APP">%1$s</xliff:g> tətbiqi ilə tamamlana bilməz."</string>
+    <string name="could_not_use_app" msgid="8137587876138569083">"<xliff:g id="APP">%1$s</xliff:g> Tətbiqi istifadə edə bilmədi."</string>
+    <string name="pay_with" msgid="5531545488795798945">"İlə ödə"</string>
+    <string name="complete_with" msgid="6797459104103012992">"İlə tamamla"</string>
+    <string name="default_pay_app_removed" msgid="4108250545457437360">"Tıkla və ödə üçün tərcih etdiyiniz xidmət silindi. Digərisi seçilsin?"</string>
+    <string name="ask_nfc_tap" msgid="2925239870458286340">"Tamamlamaq üçün digər cihaza tıklayın"</string>
+    <string name="wifi_connect" msgid="6250727951843550671">"Qoşul"</string>
+    <string name="status_unable_to_connect" msgid="9183908200295307657">"Şəbəkəyə qoşulmaq mümkün deyil"</string>
+    <string name="status_wifi_connected" msgid="5893022897732105739">"Qoşuldu"</string>
+    <string name="title_connect_to_network" msgid="2474034615817280146">"Şəbəkəyə qoşulun"</string>
+    <string name="prompt_connect_to_network" msgid="8511683573657516114">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> şəbəkəsinə birləşdirilsin?"</string>
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android Beam aktivləşmək üçün NFC tələb edir. Aktivləşdirmək istəyirsiniz?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
 </resources>
diff --git a/res/values-bg/provisioning.xml b/res/values-bg/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-bg/provisioning.xml
+++ b/res/values-bg/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 50c0a2b..1b4cd27 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"Докоснете, за да видите"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Устройството на получателя не поддържа прехвърляне на големи файлове чрез излъчване."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Приближете отново устройствата едно до друго"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"Свързва се"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"Има връзка"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"Не можа да се установи връзка"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"Изключва се"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"Изключено"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"Извършва се сдвояване"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"Не можа да се сдвои"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Понастоящем Android Лъч работи. Опитайте отново, когато предишното прехвърляне завърши."</string>
+    <string name="device" msgid="4459621591392478151">"устройството"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"Установява се връзка с/ъс <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"Установена е връзка с/ъс <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"Не можа да се установи връзка с/ъс <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"Връзката с/ъс <xliff:g id="DEVICE_NAME">%1$s</xliff:g> се прекратява"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"Връзката с/ъс <xliff:g id="DEVICE_NAME">%1$s</xliff:g> е прекратена"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"Извършва се сдвояване с/ъс <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"Неуспешно сдвояване с/ъс <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"Bluetooth не можа да се активира"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"Наистина ли искате да сдвоите устройството с Bluetooth <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"Да"</string>
@@ -42,8 +44,6 @@
     <string name="status_wifi_connected" msgid="5893022897732105739">"Установена е връзка"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"Установяване на връзка с мрежата"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"Да се установи ли връзка с мрежата „<xliff:g id="NETWORK_SSID">%1$s</xliff:g>“?"</string>
-    <!-- no translation found for beam_requires_nfc_enabled (2800366967218600534) -->
-    <skip />
-    <!-- no translation found for beam_requires_beam_enabled (5620935068991096814) -->
-    <skip />
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Функцията „Android Лъч“ изисква да активирате КБП. Искате ли да го направите?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Лъч"</string>
 </resources>
diff --git a/res/values-bn-rBD/provisioning.xml b/res/values-bn-rBD/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-bn-rBD/provisioning.xml
+++ b/res/values-bn-rBD/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index 77d8297..9b5a7f5 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"দেখতে স্পর্শ করুন"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"রিসিভার এর ডিভাইস বীমের মাধ্যমে বড় ফাইল স্থানান্তর সমর্থন করে না।"</string>
     <string name="beam_try_again" msgid="3364677301009783455">"ডিভাইসগুলিকে আবার একত্র করুন"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"সংযুক্ত হচ্ছে"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"সংযুক্ত হয়েছে"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"সংযুক্ত করা যায়নি"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"সংযোগ বিচ্ছিন্ন হচ্ছে"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"সংযোগ বিচ্ছিন্ন করা হয়েছে"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"যুক্ত করা হচ্ছে..."</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"যুক্ত করা যায়নি"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"বীম বর্তমানে ব্যস্ত রয়েছে৷ পূর্ববর্তী স্থানন্তরণটি সম্পূর্ণ হলে আবার চেষ্টা করুন৷"</string>
+    <string name="device" msgid="4459621591392478151">"ডিভাইস"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> এর সাথে সংযোগ করা হচ্ছে"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> সংযুক্ত হয়েছে"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> সংযোগ করা যায়নি"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> থেকে সংযোগ বিচ্ছিন্ন করা হচ্ছে"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> থেকে সংযোগ বিচ্ছিন্ন হয়েছে"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> যুক্ত করা হচ্ছে"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> যুক্ত করা যায়নি"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"Bluetooth সক্ষম করা যায়নি"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"আপনি কি <xliff:g id="DEVICE_NAME">%1$s</xliff:g> Bluetooth ডিভাইসটি যুক্ত করার ব্যাপারে নিশ্চিত?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"হ্যাঁ"</string>
@@ -43,5 +45,5 @@
     <string name="title_connect_to_network" msgid="2474034615817280146">"নেটওয়ার্কের সাথে সংযোগ করুন"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> নেটওয়ার্কে সংযোগ করবেন?"</string>
     <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android Beam সক্ষম করতে NFC আবশ্যক। আপনি কি এটি সক্ষম করতে চান?"</string>
-    <string name="beam_requires_beam_enabled" msgid="5620935068991096814">"সেটিংসে Android Beam সক্ষম করা নাই। আপনি কি এটি সক্ষম করতে চান?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android বীম"</string>
 </resources>
diff --git a/res/values-ca/provisioning.xml b/res/values-ca/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-ca/provisioning.xml
+++ b/res/values-ca/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 9e54cf1..ce34a07 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -9,7 +9,7 @@
     <string name="outbound_me_profile_text" msgid="5594998841143667989">"Toca per donar la teva informació de contacte a aquesta persona."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC activat."</string>
     <string name="touch" msgid="4727218133711188355">"Toca per fer brillar"</string>
-    <string name="beam_progress" msgid="7453634884807323920">"Transferència d\'entrada..."</string>
+    <string name="beam_progress" msgid="7453634884807323920">"Transferència entrant..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"S\'està compartint..."</string>
     <string name="beam_complete" msgid="477026736424637435">"Sensor completat"</string>
     <string name="beam_failed" msgid="5116241718189888630">"El sensor no s\'ha executat"</string>
@@ -18,15 +18,17 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"Toca per visualitzar"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"El dispositiu del receptor no és compatible amb la transferència de fitxers grans mitjançant sensors."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Torna a apropar els dispositius"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"S\'està connectant"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"Connectat"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"No es pot establir la connexió"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"S\'està desconnectant"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"Desconnectat"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"Sincronització"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"No es pot emparellar"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"En aquest moment Beam està ocupat. Prova-ho de nou quan acabi la transferència anterior."</string>
+    <string name="device" msgid="4459621591392478151">"dispositiu"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"S\'està connectant <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"S\'ha connectat <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"No s\'ha pogut connectar <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"S\'està desconnectant <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"S\'ha desconnectat <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"S\'està vinculant <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"No s\'ha pogut vincular <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"No es pot activar el Bluetooth"</string>
-    <string name="confirm_pairing" msgid="4112568077038265363">"Estàs segur que vols emparellar el dispositiu Bluetooth <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
+    <string name="confirm_pairing" msgid="4112568077038265363">"Estàs segur que vols vincular el dispositiu Bluetooth <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"Sí"</string>
     <string name="pair_no" msgid="5022308368904055020">"No"</string>
     <string name="tap_again_to_pay" msgid="5754988005412859897">"Torna a tocar per pagar amb <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -42,8 +44,6 @@
     <string name="status_wifi_connected" msgid="5893022897732105739">"Connexió correcta"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"Connexió a la xarxa"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"Vols connectar-te a la xarxa <xliff:g id="NETWORK_SSID">%1$s</xliff:g>?"</string>
-    <!-- no translation found for beam_requires_nfc_enabled (2800366967218600534) -->
-    <skip />
-    <!-- no translation found for beam_requires_beam_enabled (5620935068991096814) -->
-    <skip />
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android Beam requereix que s\'activi NFC. Vols activar-lo?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
 </resources>
diff --git a/res/values-cs/provisioning.xml b/res/values-cs/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-cs/provisioning.xml
+++ b/res/values-cs/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 8340c75..0b35ed8 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"Zobrazte dotykem"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Zařízení příjemce nepodporuje přenos velkých souborů prostřednictvím funkce Beam."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Znovu přibližte zařízení"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"Připojování"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"Připojeno"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"Nelze připojit"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"Odpojování"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"Odpojeno"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"Párování"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"Nelze spárovat"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Aplikace Beam je momentálně zaneprázdněná. Opakujte akci po dokončení předchozího přenosu."</string>
+    <string name="device" msgid="4459621591392478151">"zařízení"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"Připojování k zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"Připojeno k zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"Zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g> se nepodařilo připojit"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"Odpojování od zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"Odpojeno od zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"Párování se zařízením <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"Zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g> nelze spárovat"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"Bluetooth nelze povolit."</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"Opravdu chcete spárovat zařízení Bluetooth <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"Ano"</string>
@@ -33,7 +35,7 @@
     <string name="tap_again_to_complete" msgid="5423640945118279123">"Dotykem akci dokončíte pomocí aplikace <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="transaction_failure" msgid="7828102078637936513">"Tuto transakci nelze dokončit pomocí aplikace <xliff:g id="APP">%1$s</xliff:g>."</string>
     <string name="could_not_use_app" msgid="8137587876138569083">"Aplikaci <xliff:g id="APP">%1$s</xliff:g> nelze použít."</string>
-    <string name="pay_with" msgid="5531545488795798945">"Zaplatit pomocí"</string>
+    <string name="pay_with" msgid="5531545488795798945">"Platební metoda"</string>
     <string name="complete_with" msgid="6797459104103012992">"Dokončit pomocí"</string>
     <string name="default_pay_app_removed" msgid="4108250545457437360">"Preferovaná služba pro platbu mobilem byla odstraněna. Chcete vybrat jinou?"</string>
     <string name="ask_nfc_tap" msgid="2925239870458286340">"Akci dokončíte tím, že se zařízením dotknete jiného zařízení"</string>
@@ -42,8 +44,6 @@
     <string name="status_wifi_connected" msgid="5893022897732105739">"Připojeno"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"Připojit k síti"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"Připojit k síti <xliff:g id="NETWORK_SSID">%1$s</xliff:g>?"</string>
-    <!-- no translation found for beam_requires_nfc_enabled (2800366967218600534) -->
-    <skip />
-    <!-- no translation found for beam_requires_beam_enabled (5620935068991096814) -->
-    <skip />
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Funkce Android Beam k aktivaci vyžaduje technologii NFC. Chcete ji aktivovat?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Teleport Android"</string>
 </resources>
diff --git a/res/values-da/provisioning.xml b/res/values-da/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-da/provisioning.xml
+++ b/res/values-da/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 1b6362a..5b811b7 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"Tryk for at se"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Modtagerens enhed understøtter ikke overførsel af store filer via Beam."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Før enhederne sammen igen"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"Opretter forbindelse"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"Forbundet"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"Der kunne ikke oprettes forbindelse"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"Afbryder forbindelse"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"Afbrudt"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"Parrer"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"Kunne ikke parres"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Beam er optaget i øjeblikket. Prøv igen, når den forrige overførsel er gennemført."</string>
+    <string name="device" msgid="4459621591392478151">"enhed"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"Opretter forbindelse til <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"Forbundet med <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"Kunne ikke oprette forbindelse til <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"Forbindelsen til <xliff:g id="DEVICE_NAME">%1$s</xliff:g> afbrydes"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"Forbindelsen til <xliff:g id="DEVICE_NAME">%1$s</xliff:g> er afbrudt"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"Parrer med <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"Parring med <xliff:g id="DEVICE_NAME">%1$s</xliff:g> mislykkedes"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"Bluetooth kunne ikke aktiveres"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"Er du sikker på du vil parre Bluetooth-enheden <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"Ja"</string>
@@ -42,8 +44,6 @@
     <string name="status_wifi_connected" msgid="5893022897732105739">"Der er oprettet forbindelse"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"Opret forbindelse til netværket"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"Vil du oprette forbindelse til netværket <xliff:g id="NETWORK_SSID">%1$s</xliff:g>?"</string>
-    <!-- no translation found for beam_requires_nfc_enabled (2800366967218600534) -->
-    <skip />
-    <!-- no translation found for beam_requires_beam_enabled (5620935068991096814) -->
-    <skip />
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android Beam kræver, at NFC er aktiveret. Vil du at aktivere NFC?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
 </resources>
diff --git a/res/values-de/provisioning.xml b/res/values-de/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-de/provisioning.xml
+++ b/res/values-de/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index f61763b..beb17b7 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"Zum Anzeigen berühren"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Das Gerät des Empfängers unterstützt die Übertragung großer Dateien durch Beamen nicht."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Geräte erneut nebeneinander platzieren"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"Verbindung wird hergestellt"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"Verbunden"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"Verbindung nicht möglich"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"Verbindung wird aufgehoben"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"Verbindung getrennt"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"Pairing erfolgt"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"Pairing nicht möglich"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Android Beam ist momentan ausgelastet. Bitte versuchen Sie es erneut, wenn die vorherige Übertragung abgeschlossen ist."</string>
+    <string name="device" msgid="4459621591392478151">"Gerät"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"Verbindung zu <xliff:g id="DEVICE_NAME">%1$s</xliff:g> wird hergestellt"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"Mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> verbunden"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"Verbindung zu <xliff:g id="DEVICE_NAME">%1$s</xliff:g> nicht möglich"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"Verbindung zu <xliff:g id="DEVICE_NAME">%1$s</xliff:g> wird getrennt"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"Verbindung zu <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ist getrennt"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"Pairing mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> wird durchgeführt"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"Pairing mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> nicht möglich"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"Bluetooth konnte nicht aktiviert werden."</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"Möchten Sie das Bluetooth-Gerät <xliff:g id="DEVICE_NAME">%1$s</xliff:g> wirklich koppeln?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"Ja"</string>
@@ -42,8 +44,6 @@
     <string name="status_wifi_connected" msgid="5893022897732105739">"Verbunden"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"Mit Netzwerk verbinden"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"Verbindung zum Netzwerk <xliff:g id="NETWORK_SSID">%1$s</xliff:g> herstellen?"</string>
-    <!-- no translation found for beam_requires_nfc_enabled (2800366967218600534) -->
-    <skip />
-    <!-- no translation found for beam_requires_beam_enabled (5620935068991096814) -->
-    <skip />
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android Beam erfordert zur Aktivierung die Nahfeldkommunikation (NFC). Möchten Sie sie aktivieren?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
 </resources>
diff --git a/res/values-el/provisioning.xml b/res/values-el/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-el/provisioning.xml
+++ b/res/values-el/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index ecb4224..ce1fc72 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"Αγγίξτε για προβολή"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Η συσκευή του παραλήπτη δεν υποστηρίζει τη μεταφορά μεγάλων αρχείων μέσω ζεύξης."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Φέρτε ξανά τις συσκευές σας σε επαφή"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"Σύνδεση"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"Συνδέθηκε"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"Δεν ήταν δυνατή η σύνδεση"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"Αποσύνδεση"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"Σε αποσύνδεση"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"Σύζευξη"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"Δεν ήταν δυνατή η σύζευξη"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Η λειτουργία ζεύξης είναι απασχολημένη αυτήν τη στιγμή. Δοκιμάστε ξανά μετά την ολοκλήρωση της προηγούμενης μεταφοράς."</string>
+    <string name="device" msgid="4459621591392478151">"συσκευή"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"Σύνδεση σε <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"Συνδέθηκε <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"Δεν ήταν δυνατή η σύνδεση σε <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"Αποσύνδεση <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"Αποσυνδέθηκε <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"Σύζευξη <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"Δεν ήταν δυνατή η σύζευξη <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"Δεν ήταν δυνατή η ενεργοποίηση του Bluetooth"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"Είστε βέβαιοι ότι θέλετε να γίνει σύζευξη της συσκευής Bluetooth <xliff:g id="DEVICE_NAME">%1$s</xliff:g>;"</string>
     <string name="pair_yes" msgid="3525614878559994448">"Ναι"</string>
@@ -42,8 +44,6 @@
     <string name="status_wifi_connected" msgid="5893022897732105739">"Συνδέθηκε"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"Σύνδεση στο δίκτυο"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"Σύνδεση στο δίκτυο <xliff:g id="NETWORK_SSID">%1$s</xliff:g>;"</string>
-    <!-- no translation found for beam_requires_nfc_enabled (2800366967218600534) -->
-    <skip />
-    <!-- no translation found for beam_requires_beam_enabled (5620935068991096814) -->
-    <skip />
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Το Android Beam απαιτεί την ενεργοποίηση της ΕΚΠ (Επικοινωνία κοντινού πεδίου). Θέλετε να την ενεργοποιήσετε;"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
 </resources>
diff --git a/res/values-en-rAU/provisioning.xml b/res/values-en-rAU/provisioning.xml
new file mode 100644
index 0000000..676cad9
--- /dev/null
+++ b/res/values-en-rAU/provisioning.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2013 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.
+ -->
+
+<!--  NFC resources that may need to be customized
+     for different hardware or product builds.  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="provisioning_mime_types">
+    <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
+  </string-array>
+</resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
new file mode 100644
index 0000000..307e92c
--- /dev/null
+++ b/res/values-en-rAU/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="78565911793142902">"Nfc Service"</string>
+    <string name="nfcUserLabel" msgid="7708535817084357357">"Nfc"</string>
+    <string name="inbound_me_profile_title" msgid="6146013785225412693">"Contact received over NFC"</string>
+    <string name="inbound_me_profile_text" msgid="2342757196108092923">"Touch to add this person as a contact."</string>
+    <string name="outbound_me_profile_title" msgid="2523625031572784769">"NFC interaction complete"</string>
+    <string name="outbound_me_profile_text" msgid="5594998841143667989">"Touch to give this person your contact info."</string>
+    <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC enabled."</string>
+    <string name="touch" msgid="4727218133711188355">"Touch to beam"</string>
+    <string name="beam_progress" msgid="7453634884807323920">"Incoming beam..."</string>
+    <string name="beam_outgoing" msgid="4679536649779123495">"Beaming..."</string>
+    <string name="beam_complete" msgid="477026736424637435">"Beam complete"</string>
+    <string name="beam_failed" msgid="5116241718189888630">"Beam did not complete"</string>
+    <string name="beam_canceled" msgid="5425192751826544741">"Beam cancelled"</string>
+    <string name="cancel" msgid="61873902552555096">"Cancel"</string>
+    <string name="beam_touch_to_view" msgid="7853129156831642630">"Touch to view"</string>
+    <string name="beam_handover_not_supported" msgid="4083165921751489015">"The receiver\'s device doesn\'t support large file transfer via beam."</string>
+    <string name="beam_try_again" msgid="3364677301009783455">"Bring devices together again"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Beam is currently busy. Try again when the previous transfer completes."</string>
+    <string name="device" msgid="4459621591392478151">"device"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"Connecting <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"Connected <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"Could not connect <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"Disconnecting <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"Disconnected <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"Pairing <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"Could not pair <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="failed_to_enable_bt" msgid="7229153323594758077">"Could not enable Bluetooth"</string>
+    <string name="confirm_pairing" msgid="4112568077038265363">"Are you sure you want to pair the Bluetooth device <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
+    <string name="pair_yes" msgid="3525614878559994448">"Yes"</string>
+    <string name="pair_no" msgid="5022308368904055020">"No"</string>
+    <string name="tap_again_to_pay" msgid="5754988005412859897">"Tap again to pay with <xliff:g id="APP">%1$s</xliff:g>"</string>
+    <string name="tap_again_to_complete" msgid="5423640945118279123">"Tap again to complete with <xliff:g id="APP">%1$s</xliff:g>"</string>
+    <string name="transaction_failure" msgid="7828102078637936513">"This transaction couldn\'t be completed with <xliff:g id="APP">%1$s</xliff:g>."</string>
+    <string name="could_not_use_app" msgid="8137587876138569083">"Couldn\'t use <xliff:g id="APP">%1$s</xliff:g>."</string>
+    <string name="pay_with" msgid="5531545488795798945">"Pay with:"</string>
+    <string name="complete_with" msgid="6797459104103012992">"Complete with"</string>
+    <string name="default_pay_app_removed" msgid="4108250545457437360">"Your preferred service for tap &amp; pay was removed. Choose another?"</string>
+    <string name="ask_nfc_tap" msgid="2925239870458286340">"Tap another device to complete"</string>
+    <string name="wifi_connect" msgid="6250727951843550671">"Connect"</string>
+    <string name="status_unable_to_connect" msgid="9183908200295307657">"Unable to connect to network"</string>
+    <string name="status_wifi_connected" msgid="5893022897732105739">"Connected"</string>
+    <string name="title_connect_to_network" msgid="2474034615817280146">"Connect to network"</string>
+    <string name="prompt_connect_to_network" msgid="8511683573657516114">"Connect to network <xliff:g id="NETWORK_SSID">%1$s</xliff:g>?"</string>
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android Beam requires NFC to be enabled. Do you want to enable it?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
+</resources>
diff --git a/res/values-en-rGB/provisioning.xml b/res/values-en-rGB/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-en-rGB/provisioning.xml
+++ b/res/values-en-rGB/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index c516183..307e92c 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"Touch to view"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"The receiver\'s device doesn\'t support large file transfer via beam."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Bring devices together again"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"Connecting..."</string>
-    <string name="connected_headset" msgid="4047751837023241955">"Connected"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"Could not connect"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"Disconnecting"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"Disconnected"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"Pairing"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"Could not pair"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Beam is currently busy. Try again when the previous transfer completes."</string>
+    <string name="device" msgid="4459621591392478151">"device"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"Connecting <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"Connected <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"Could not connect <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"Disconnecting <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"Disconnected <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"Pairing <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"Could not pair <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"Could not enable Bluetooth"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"Are you sure you want to pair the Bluetooth device <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"Yes"</string>
@@ -43,5 +45,5 @@
     <string name="title_connect_to_network" msgid="2474034615817280146">"Connect to network"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"Connect to network <xliff:g id="NETWORK_SSID">%1$s</xliff:g>?"</string>
     <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android Beam requires NFC to be enabled. Do you want to enable it?"</string>
-    <string name="beam_requires_beam_enabled" msgid="5620935068991096814">"Android Beam is not enabled in Settings. Do you want to enable it?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
 </resources>
diff --git a/res/values-en-rIN/provisioning.xml b/res/values-en-rIN/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-en-rIN/provisioning.xml
+++ b/res/values-en-rIN/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index c516183..307e92c 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"Touch to view"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"The receiver\'s device doesn\'t support large file transfer via beam."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Bring devices together again"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"Connecting..."</string>
-    <string name="connected_headset" msgid="4047751837023241955">"Connected"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"Could not connect"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"Disconnecting"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"Disconnected"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"Pairing"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"Could not pair"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Beam is currently busy. Try again when the previous transfer completes."</string>
+    <string name="device" msgid="4459621591392478151">"device"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"Connecting <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"Connected <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"Could not connect <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"Disconnecting <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"Disconnected <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"Pairing <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"Could not pair <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"Could not enable Bluetooth"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"Are you sure you want to pair the Bluetooth device <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"Yes"</string>
@@ -43,5 +45,5 @@
     <string name="title_connect_to_network" msgid="2474034615817280146">"Connect to network"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"Connect to network <xliff:g id="NETWORK_SSID">%1$s</xliff:g>?"</string>
     <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android Beam requires NFC to be enabled. Do you want to enable it?"</string>
-    <string name="beam_requires_beam_enabled" msgid="5620935068991096814">"Android Beam is not enabled in Settings. Do you want to enable it?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
 </resources>
diff --git a/res/values-es-rUS/provisioning.xml b/res/values-es-rUS/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-es-rUS/provisioning.xml
+++ b/res/values-es-rUS/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 7eea8c5..aa564b0 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"Toca para ver"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"El dispositivo del receptor no admite la transferencia de archivos de gran tamaño."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Volver a unir los dispositivos"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"Conectando..."</string>
-    <string name="connected_headset" msgid="4047751837023241955">"Conectados"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"No se pudo conectar"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"Desconectando..."</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"Desconectados"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"Sincronizando..."</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"No se pudo sincronizar"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Beam está ocupado en este momento. Vuelve a intentarlo cuando finalice la transferencia anterior."</string>
+    <string name="device" msgid="4459621591392478151">"dispositivo"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"Conectando <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> con conexión"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"Error al conectar <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"Desconectando <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sin conexión"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"Sincronizando <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"Error al sincronizar <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"Error al activar Bluetooth"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"¿Realmente deseas sincronizar el dispositivo Bluetooth <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"Sí"</string>
@@ -42,8 +44,6 @@
     <string name="status_wifi_connected" msgid="5893022897732105739">"Conexión establecida"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"Conectar a la red"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"¿Conectarse a la red <xliff:g id="NETWORK_SSID">%1$s</xliff:g>?"</string>
-    <!-- no translation found for beam_requires_nfc_enabled (2800366967218600534) -->
-    <skip />
-    <!-- no translation found for beam_requires_beam_enabled (5620935068991096814) -->
-    <skip />
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Para usar Android Beam, debes habilitar la función NFC. ¿Quieres habilitarla?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
 </resources>
diff --git a/res/values-es/provisioning.xml b/res/values-es/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-es/provisioning.xml
+++ b/res/values-es/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index f76ccc7..b05c6cb 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"Tocar para ver"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"El dispositivo del receptor no admite la transferencia de archivos de gran tamaño."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Vuelve a juntar los dispositivos"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"Conectando..."</string>
-    <string name="connected_headset" msgid="4047751837023241955">"Conectado"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"Error al establecer conexión"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"Desconectando..."</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"Desconectado"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"Vinculando"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"Error al vincular"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Android Beam está ocupado en este momento. Vuelve a intentarlo cuando se complete la transferencia anterior."</string>
+    <string name="device" msgid="4459621591392478151">"dispositivo"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"Conectando <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> conectado"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"No se ha podido conectar <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"Desconectando <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> desconectado"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"Vinculando <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"No se ha podido vincular <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"Error al habilitar Bluetooth"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"¿Seguro que quieres vincular el dispositivo Bluetooth <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"Sí"</string>
@@ -42,8 +44,6 @@
     <string name="status_wifi_connected" msgid="5893022897732105739">"Conectado"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"Conectar a la red"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"¿Quieres conectarte a la red <xliff:g id="NETWORK_SSID">%1$s</xliff:g>?"</string>
-    <!-- no translation found for beam_requires_nfc_enabled (2800366967218600534) -->
-    <skip />
-    <!-- no translation found for beam_requires_beam_enabled (5620935068991096814) -->
-    <skip />
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Para usar Android Beam, NFC debe estar habilitado. ¿Quieres habilitarlo?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
 </resources>
diff --git a/res/values-et-rEE/provisioning.xml b/res/values-et-rEE/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-et-rEE/provisioning.xml
+++ b/res/values-et-rEE/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 3a8afeb..f9b8ac8 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"Puudutage  vaatamiseks"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Vastuvõtja seade ei toeta suurte failide edastamist kiire kaudu."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Ühendage seadmed uuesti"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"Ühendamine"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"Ühendatud"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"Ühendust ei õnnestunud luua"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"Ühenduse katkestamine"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"Ühendus on katkestatud"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"Ühildamine"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"Ei saanud ühildada"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Kiirega edastamise funktsioon on praegu hõivatud. Proovige uuesti, kui ülekandmine on lõppenud."</string>
+    <string name="device" msgid="4459621591392478151">"seade"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"Ühendamine seadmega <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"Ühendatud seadmega <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"Ei õnnestunud ühendada seadmega <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"Ühenduse katkestamine seadmega <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"Ühendus seadmega <xliff:g id="DEVICE_NAME">%1$s</xliff:g> on katkestatud"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"Sidumine seadmega <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"Ei saa siduda seadmega <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"Bluetoothi ei saanud lubada"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"Kas soovite kindlasti ühildada Bluetoothi seadme <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"Jah"</string>
@@ -42,8 +44,6 @@
     <string name="status_wifi_connected" msgid="5893022897732105739">"Ühendatud"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"Võrguühenduse loomine"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"Kas luua ühendus võrguga <xliff:g id="NETWORK_SSID">%1$s</xliff:g>?"</string>
-    <!-- no translation found for beam_requires_nfc_enabled (2800366967218600534) -->
-    <skip />
-    <!-- no translation found for beam_requires_beam_enabled (5620935068991096814) -->
-    <skip />
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android Beam nõuab NFC lubamist. Kas soovite selle lubada?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
 </resources>
diff --git a/res/values-eu-rES/provisioning.xml b/res/values-eu-rES/provisioning.xml
index bc2afcb..0c79a06 100644
--- a/res/values-eu-rES/provisioning.xml
+++ b/res/values-eu-rES/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"aplikazioa/com.android.kudeatutakohorniketa"</item>
+    <item msgid="9182300251635024136">"aplikazioa/com.android.kudeatutakohorniketa.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index ef79e65..7c3243a 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"Ukitu ikusteko"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Hartzailearen gailuak ez du onartzen fitxategi handiak NFC bidez transferitzea."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Elkartu gailuak berriro"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"Konektatzen"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"Konektatuta"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"Ezin izan da konektatu"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"Deskonektatzen"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"Deskonektatuta"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"Parekatzen"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"Ezin izan da parekatu"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Beam lanpetuta dago. Saiatu berriro abian den transferentzia amaitutakoan."</string>
+    <string name="device" msgid="4459621591392478151">"gailua"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> konektatzen"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> konektatu da"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"Ezin izan da <xliff:g id="DEVICE_NAME">%1$s</xliff:g> konektatu"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> deskonektatzen"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> deskonektatu da"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> gailuarekin parekatzen"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"Ezin izan da <xliff:g id="DEVICE_NAME">%1$s</xliff:g> gailuarekin parekatu"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"Ezin izan da Bluetootha gaitu"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"Ziur <xliff:g id="DEVICE_NAME">%1$s</xliff:g> Bluetooth gailuarekin parekatu nahi duzula?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"Bai"</string>
@@ -42,8 +44,6 @@
     <string name="status_wifi_connected" msgid="5893022897732105739">"Konektatuta"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"Konektatu sarera"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> sarera konektatu nahi duzu?"</string>
-    <!-- no translation found for beam_requires_nfc_enabled (2800366967218600534) -->
-    <skip />
-    <!-- no translation found for beam_requires_beam_enabled (5620935068991096814) -->
-    <skip />
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android Beam erabiltzeko NFC gaitu behar da. Gaitu egin nahi duzu?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
 </resources>
diff --git a/res/values-fa/provisioning.xml b/res/values-fa/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-fa/provisioning.xml
+++ b/res/values-fa/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index ed6ab2f..a3fe0e7 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"برای مشاهده لمس کنید"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"دستگاه گیرنده انتقال فایل‌های بزرگ از طریق پرتو را پشتیبانی نمی‌کند."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"مرتبط‌کردن دوباره دستگاه‌ها"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"در حال اتصال"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"اتصال برقرار شد"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"متصل نشد"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"در حال قطع اتصال"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"اتصال قطع شد"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"در حال جفت کردن"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"جفت نشد"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"«پرتو» در حال حاضر مشغول است. هنگامی که انتقال قبلی کامل شد دوباره امتحان کنید."</string>
+    <string name="device" msgid="4459621591392478151">"دستگاه"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"در حال اتصال <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> متصل شد"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> متصل نشد"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"در حال قطع ارتباط <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"ارتباط <xliff:g id="DEVICE_NAME">%1$s</xliff:g> قطع شد"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"در حال مرتبط‌سازی <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> مرتبط نشد"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"فعال کردن بلوتوث امکانپذیر نیست"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"آیا مطمئن هستید که می‌خواهید دستگاه بلوتوث <xliff:g id="DEVICE_NAME">%1$s</xliff:g> را جفت کنید؟"</string>
     <string name="pair_yes" msgid="3525614878559994448">"بله"</string>
@@ -42,8 +44,6 @@
     <string name="status_wifi_connected" msgid="5893022897732105739">"مرتبط شد"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"اتصال به شبکه"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"به شبکه <xliff:g id="NETWORK_SSID">%1$s</xliff:g> متصل می‌شوید؟"</string>
-    <!-- no translation found for beam_requires_nfc_enabled (2800366967218600534) -->
-    <skip />
-    <!-- no translation found for beam_requires_beam_enabled (5620935068991096814) -->
-    <skip />
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"‏پرتوی Android برای فعال شدن به NFC نیاز دارد. می‌خواهید آن را فعال کنید؟"</string>
+    <string name="android_beam" msgid="1666446406999492763">"‏پرتو Android"</string>
 </resources>
diff --git a/res/values-fi/provisioning.xml b/res/values-fi/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-fi/provisioning.xml
+++ b/res/values-fi/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index ca1bcb0..609c19d 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -8,7 +8,7 @@
     <string name="outbound_me_profile_title" msgid="2523625031572784769">"NFC-vuorovaikutus suoritettu"</string>
     <string name="outbound_me_profile_text" msgid="5594998841143667989">"Anna tälle henkilölle yhteystietosi koskettamalla."</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC otettu käyttöön."</string>
-    <string name="touch" msgid="4727218133711188355">"Kosketa palkkia"</string>
+    <string name="touch" msgid="4727218133711188355">"Muodosta yhteys"</string>
     <string name="beam_progress" msgid="7453634884807323920">"Saapuva sisällönjakopyyntö..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"Jaetaan sisältöä…"</string>
     <string name="beam_complete" msgid="477026736424637435">"Sisältö jaettu"</string>
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"Kosketa ja näytä"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Vastaanottajan laite ei tue suurten tiedostojen siirtoa sisällön jakamisen kautta."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Yhdistä laitteet uudelleen"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"Yhdistetään"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"Yhdistetty"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"Ei yhteyttä"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"Katkaistaan yhteyttä"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"Yhteys katkaistu"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"Laiteparia muodostetaan"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"Laiteparia ei voi muodostaa"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Beam on tällä hetkellä varattu. Yritä uudelleen, kun edellinen siirto on valmis."</string>
+    <string name="device" msgid="4459621591392478151">"laite"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"Yhdistetään <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> on yhdistetty"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ei voinut muodostaa yhteyttä"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"Katkaistaan yhteys: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ei ole enää yhteydessä"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"Muodostetaan laiteparia: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"Laiteparia ei voitu muodostaa: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"Bluetooth-yhteyttä ei voi ottaa käyttöön"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"Oletko varma, että haluat muodostaa laiteparin Bluetooth-laitteeseen <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"Kyllä"</string>
@@ -43,5 +45,5 @@
     <string name="title_connect_to_network" msgid="2474034615817280146">"Yhdistä verkkoon"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"Yhdistetäänkö verkkoon <xliff:g id="NETWORK_SSID">%1$s</xliff:g>?"</string>
     <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android Beam edellyttää, että NFC on käytössä. Haluatko ottaa sen käyttöön?"</string>
-    <string name="beam_requires_beam_enabled" msgid="5620935068991096814">"Android Beam ei ole käytössä. Haluatko ottaa sen käyttöön?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
 </resources>
diff --git a/res/values-fr-rCA/provisioning.xml b/res/values-fr-rCA/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-fr-rCA/provisioning.xml
+++ b/res/values-fr-rCA/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 1f365a8..6d29ed9 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"Appuyer pour afficher"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Le récepteur n\'est pas compatible avec le transfert de fichiers volumineux via le partage."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Mettre de nouveau les appareils côte à côte"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"Connexion en cours…"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"Connecté"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"Impossible d’établir la connexion."</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"Déconnexion en cours…"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"Déconnecté"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"Association en cours"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"Impossible d\'effectuer l\'association."</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Beam est actuellement occupé. Essayez de nouveau lorsque le transfert précédent sera terminé."</string>
+    <string name="device" msgid="4459621591392478151">"appareil"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"Connexion de « <xliff:g id="DEVICE_NAME">%1$s</xliff:g> » en cours"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"Connecté à « <xliff:g id="DEVICE_NAME">%1$s</xliff:g> »"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"Impossible de connecter « <xliff:g id="DEVICE_NAME">%1$s</xliff:g> »"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"Déconnexion de « <xliff:g id="DEVICE_NAME">%1$s</xliff:g> » en cours"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"Déconnecté de « <xliff:g id="DEVICE_NAME">%1$s</xliff:g> »"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"Association de « <xliff:g id="DEVICE_NAME">%1$s</xliff:g> » en cours"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"Impossible d\'associer « <xliff:g id="DEVICE_NAME">%1$s</xliff:g> »"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"Impossible d\'activer le Bluetooth."</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"Voulez-vous vraiment associer l\'appareil Bluetooth <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"Oui"</string>
@@ -42,8 +44,6 @@
     <string name="status_wifi_connected" msgid="5893022897732105739">"Connecté"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"Se connecter au réseau"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"Se connecter au réseau <xliff:g id="NETWORK_SSID">%1$s</xliff:g>?"</string>
-    <!-- no translation found for beam_requires_nfc_enabled (2800366967218600534) -->
-    <skip />
-    <!-- no translation found for beam_requires_beam_enabled (5620935068991096814) -->
-    <skip />
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"L\'activation de la connectivité NFC est nécessaire pour utiliser Android Beam. Voulez-vous l\'activer?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
 </resources>
diff --git a/res/values-fr/provisioning.xml b/res/values-fr/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-fr/provisioning.xml
+++ b/res/values-fr/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index d8e4579..5f2de3d 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"Appuyer pour afficher"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Le récepteur n\'est pas compatible avec le transfert de fichiers volumineux via le partage."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Mettre de nouveau les appareils côte à côte"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"Connexion en cours…"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"Connecté"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"Impossible d’établir la connexion."</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"Déconnexion en cours…"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"Déconnecté"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"Association en cours…"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"Impossible d\'effectuer l\'association."</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Android Beam est actuellement occupé. Veuillez réessayer une fois le transfert précédent terminé."</string>
+    <string name="device" msgid="4459621591392478151">"appareil"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"Connexion de l\'appareil <xliff:g id="DEVICE_NAME">%1$s</xliff:g> en cours…"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"L\'appareil <xliff:g id="DEVICE_NAME">%1$s</xliff:g> a bien été connecté."</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"Impossible de connecter <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"Déconnexion de l\'appareil <xliff:g id="DEVICE_NAME">%1$s</xliff:g> en cours…"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"L\'appareil <xliff:g id="DEVICE_NAME">%1$s</xliff:g> a bien été déconnecté."</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"Association de l\'appareil <xliff:g id="DEVICE_NAME">%1$s</xliff:g> en cours…"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"Impossible d\'associer l\'appareil <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"Impossible d\'activer le Bluetooth."</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"Voulez-vous vraiment associer l\'appareil Bluetooth <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"Oui"</string>
@@ -42,8 +44,6 @@
     <string name="status_wifi_connected" msgid="5893022897732105739">"Connecté"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"Se connecter au réseau"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"Se connecter au réseau <xliff:g id="NETWORK_SSID">%1$s</xliff:g> ?"</string>
-    <!-- no translation found for beam_requires_nfc_enabled (2800366967218600534) -->
-    <skip />
-    <!-- no translation found for beam_requires_beam_enabled (5620935068991096814) -->
-    <skip />
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"L\'activation de la NFC est nécessaire pour utiliser Android Beam. Voulez-vous l\'activer ?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
 </resources>
diff --git a/res/values-gl-rES/provisioning.xml b/res/values-gl-rES/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-gl-rES/provisioning.xml
+++ b/res/values-gl-rES/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index 4f3c8b3..845ee42 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"Toca para ver"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"O dispositivo do destinatario non é compatible coa transferencia de ficheiros grandes."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Achega os dispositivos de novo"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"Conectando"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"Conectado"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"Non se puido conectar"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"Desconectando"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"Desconectado"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"Sincronizando"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"Non se puido sincronizar"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Beam está ocupado neste momento. Téntao de novo cando se complete a transferencia anterior."</string>
+    <string name="device" msgid="4459621591392478151">"dispositivo"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"Conectando <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> conectado"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"Non se puido conectar <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"Desconectando <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> desconectado"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"Sincronizando <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"Non se puido sincronizar <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"Non se puido activar o Bluetooth"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"Seguro que queres sincronizar o dispositivo Bluetooth <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"Si"</string>
@@ -42,8 +44,6 @@
     <string name="status_wifi_connected" msgid="5893022897732105739">"Conectado"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"Conectar coa rede"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"Queres conectarte á rede <xliff:g id="NETWORK_SSID">%1$s</xliff:g>?"</string>
-    <!-- no translation found for beam_requires_nfc_enabled (2800366967218600534) -->
-    <skip />
-    <!-- no translation found for beam_requires_beam_enabled (5620935068991096814) -->
-    <skip />
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android Beam necesita NFC para activarse. Queres activalo?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
 </resources>
diff --git a/res/values-gu-rIN/provisioning.xml b/res/values-gu-rIN/provisioning.xml
new file mode 100644
index 0000000..676cad9
--- /dev/null
+++ b/res/values-gu-rIN/provisioning.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2013 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.
+ -->
+
+<!--  NFC resources that may need to be customized
+     for different hardware or product builds.  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="provisioning_mime_types">
+    <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
+  </string-array>
+</resources>
diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml
new file mode 100644
index 0000000..de7d901
--- /dev/null
+++ b/res/values-gu-rIN/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="78565911793142902">"NFC સેવા"</string>
+    <string name="nfcUserLabel" msgid="7708535817084357357">"NFC"</string>
+    <string name="inbound_me_profile_title" msgid="6146013785225412693">"NFC પર સંપર્ક પ્રાપ્ત"</string>
+    <string name="inbound_me_profile_text" msgid="2342757196108092923">"આ વ્યક્તિને એક સંપર્ક તરીકે ઉમેરવા માટે ટચ કરો."</string>
+    <string name="outbound_me_profile_title" msgid="2523625031572784769">"NFC ક્રિયાપ્રતિક્રિયા પૂર્ણ"</string>
+    <string name="outbound_me_profile_text" msgid="5594998841143667989">"આ વ્યક્તિને તમારી સંપર્ક માહિતી આપવા માટે ટચ કરો."</string>
+    <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC સક્ષમ."</string>
+    <string name="touch" msgid="4727218133711188355">"બીમ કરવા ટચ કરો"</string>
+    <string name="beam_progress" msgid="7453634884807323920">"ઇનકમિંગ બીમ ..."</string>
+    <string name="beam_outgoing" msgid="4679536649779123495">"બીમિંગ..."</string>
+    <string name="beam_complete" msgid="477026736424637435">"બીમ પૂર્ણ"</string>
+    <string name="beam_failed" msgid="5116241718189888630">"બીમ પૂર્ણ થયું નહોતું"</string>
+    <string name="beam_canceled" msgid="5425192751826544741">"બીમ રદ કર્યું"</string>
+    <string name="cancel" msgid="61873902552555096">"રદ કરો"</string>
+    <string name="beam_touch_to_view" msgid="7853129156831642630">"જોવા માટે ટચ કરો"</string>
+    <string name="beam_handover_not_supported" msgid="4083165921751489015">"પ્રાપ્તિકર્તાનું ઉપકરણ બીમ દ્વારા મોટી ફાઇલનાં સ્થાનાંતરણનું સમર્થન કરતું નથી."</string>
+    <string name="beam_try_again" msgid="3364677301009783455">"ઉપકરણોને ફરીથી એકસાથે લાવો"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"બીમ હાલમાં વ્યસ્ત છે. પહેલાંના સ્થાનાંતરણ પૂર્ણ થાય ત્યારે ફરીથી પ્રયાસ કરો."</string>
+    <string name="device" msgid="4459621591392478151">"ઉપકરણ"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> કનેક્ટ થઈ રહ્યું છે"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> કનેક્ટ કર્યું"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> થી કનેક્ટ કરી શકાયું નથી"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ડિસ્કનેક્ટ થઈ રહ્યું છે"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ડિસ્કનેક્ટ કર્યું"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ની જોડી કરી રહ્યું છે"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ની જોડી કરી શકાઈ નથી"</string>
+    <string name="failed_to_enable_bt" msgid="7229153323594758077">"Bluetooth સક્ષમ કરી શકાયું નથી"</string>
+    <string name="confirm_pairing" msgid="4112568077038265363">"શું તમે ખરેખર Bluetooth ની ઉપકરણ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> સાથે જોડી કરવા માંગો છો?"</string>
+    <string name="pair_yes" msgid="3525614878559994448">"હા"</string>
+    <string name="pair_no" msgid="5022308368904055020">"નહીં"</string>
+    <string name="tap_again_to_pay" msgid="5754988005412859897">"<xliff:g id="APP">%1$s</xliff:g> થી ચૂકવણી કરવા માટે ફરીથી ટેપ કરો"</string>
+    <string name="tap_again_to_complete" msgid="5423640945118279123">"<xliff:g id="APP">%1$s</xliff:g> સાથે પૂર્ણ કરવા માટે ટેપ કરો"</string>
+    <string name="transaction_failure" msgid="7828102078637936513">"આ વ્યવહાર <xliff:g id="APP">%1$s</xliff:g> સાથે પૂર્ણ કરી શકાયો નથી."</string>
+    <string name="could_not_use_app" msgid="8137587876138569083">"<xliff:g id="APP">%1$s</xliff:g> નો ઉપયોગ કરી શકાયો નથી."</string>
+    <string name="pay_with" msgid="5531545488795798945">"આનાથી ચૂકવો"</string>
+    <string name="complete_with" msgid="6797459104103012992">"આની સાથે પૂર્ણ કરો"</string>
+    <string name="default_pay_app_removed" msgid="4108250545457437360">"ટેપ કરો અને ચૂકવો માટેની તમારી પસંદ કરેલ સેવા દૂર કરવામાં આવી હતી. બીજી પસંદ કરીએ?"</string>
+    <string name="ask_nfc_tap" msgid="2925239870458286340">"પૂર્ણ કરવા માટે બીજા ઉપકરણને ટેપ કરો"</string>
+    <string name="wifi_connect" msgid="6250727951843550671">"કનેક્ટ"</string>
+    <string name="status_unable_to_connect" msgid="9183908200295307657">"નેટવર્ક સાથે જોડાવવામાં અસમર્થ"</string>
+    <string name="status_wifi_connected" msgid="5893022897732105739">"કનેક્ટ કર્યું"</string>
+    <string name="title_connect_to_network" msgid="2474034615817280146">"નેટવર્ક સાથે કનેક્ટ કરો"</string>
+    <string name="prompt_connect_to_network" msgid="8511683573657516114">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> નેટવર્કથી કનેક્ટ કરીએ?"</string>
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android બીમને NFC સક્ષમ કરવાની જરૂર છે. શું તમે તેને સક્ષમ કરવા માંગો છો?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android બીમ"</string>
+</resources>
diff --git a/res/values-hi/provisioning.xml b/res/values-hi/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-hi/provisioning.xml
+++ b/res/values-hi/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 80d011b..d17db31 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -14,36 +14,36 @@
     <string name="beam_complete" msgid="477026736424637435">"बीम करना पूर्ण"</string>
     <string name="beam_failed" msgid="5116241718189888630">"बीम पूर्ण नहीं हुआ"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"बीम रद्द"</string>
-    <string name="cancel" msgid="61873902552555096">"रद्द करें"</string>
+    <string name="cancel" msgid="61873902552555096">"अभी नहीं"</string>
     <string name="beam_touch_to_view" msgid="7853129156831642630">"देखने के लिए स्‍पर्श करें"</string>
-    <string name="beam_handover_not_supported" msgid="4083165921751489015">"प्राप्तकर्ता का उपकरण, बीम द्वारा बड़ी फ़ाइल के स्थानांतरण का समर्थन नहीं करता."</string>
-    <string name="beam_try_again" msgid="3364677301009783455">"उपकरणों को पुन: एक साथ लाएं"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"कनेक्ट हो रहा है"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"कनेक्ट है"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"कनेक्‍ट नहीं किया जा सका"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"डिस्कनेक्ट कर रहा है"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"डिस्कनेक्ट किया गया"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"युग्मन"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"युग्‍मित नहीं किया जा सका"</string>
-    <string name="failed_to_enable_bt" msgid="7229153323594758077">"Bluetooth को सक्षम नहीं किया जा सका"</string>
-    <string name="confirm_pairing" msgid="4112568077038265363">"क्‍या आप वाकई Bluetooth उपकरण <xliff:g id="DEVICE_NAME">%1$s</xliff:g> को युग्मित करना चाहते हैं?"</string>
+    <string name="beam_handover_not_supported" msgid="4083165921751489015">"प्राप्तकर्ता का डिवाइस, बीम द्वारा बड़ी फ़ाइल के स्थानांतरण का समर्थन नहीं करता."</string>
+    <string name="beam_try_again" msgid="3364677301009783455">"डिवाइस को पुन: एक साथ लाएं"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Beam वर्तमान में व्‍यस्‍त है. पिछला ट्रांसफर पूर्ण हो जाने पर पुन: प्रयास करें."</string>
+    <string name="device" msgid="4459621591392478151">"डिवाइस"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> को कनेक्‍ट किया जा रहा है"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> को कनेक्‍ट किया गया"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> को कनेक्‍ट नहीं किया जा सका"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> को डिस्‍कनेक्‍ट किया जा रहा है"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> को डिस्‍कनेक्‍ट किया गया"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> को युग्‍मित किया जा रहा है"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> को युग्‍मित नहीं किया जा सका"</string>
+    <string name="failed_to_enable_bt" msgid="7229153323594758077">"ब्लूटूथ को सक्षम नहीं किया जा सका"</string>
+    <string name="confirm_pairing" msgid="4112568077038265363">"क्‍या आप वाकई ब्लूटूथ डिवाइस <xliff:g id="DEVICE_NAME">%1$s</xliff:g> को युग्मित करना चाहते हैं?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"हां"</string>
     <string name="pair_no" msgid="5022308368904055020">"नहीं"</string>
-    <string name="tap_again_to_pay" msgid="5754988005412859897">"<xliff:g id="APP">%1$s</xliff:g> के साथ भुगतान करने के लिए पुन: टैप करें"</string>
+    <string name="tap_again_to_pay" msgid="5754988005412859897">"<xliff:g id="APP">%1$s</xliff:g> के साथ पेमेंट करने के लिए पुन: टैप करें"</string>
     <string name="tap_again_to_complete" msgid="5423640945118279123">"<xliff:g id="APP">%1$s</xliff:g> के साथ पूर्ण करने के लिए पुन: टैप करें"</string>
     <string name="transaction_failure" msgid="7828102078637936513">"यह लेन-देन <xliff:g id="APP">%1$s</xliff:g> के साथ पूर्ण नहीं किया जा सकता."</string>
     <string name="could_not_use_app" msgid="8137587876138569083">"<xliff:g id="APP">%1$s</xliff:g> का उपयोग नहीं किया जा सका."</string>
-    <string name="pay_with" msgid="5531545488795798945">"इनके द्वारा भुगतान करें"</string>
+    <string name="pay_with" msgid="5531545488795798945">"इनके द्वारा पेमेंट करें"</string>
     <string name="complete_with" msgid="6797459104103012992">"इनके द्वारा पूर्ण करें"</string>
-    <string name="default_pay_app_removed" msgid="4108250545457437360">"टैप करके भुगतान करने के लिए आपकी पसंदीदा सेवा को निकाल दिया गया था. कोई अन्‍य चुनें?"</string>
-    <string name="ask_nfc_tap" msgid="2925239870458286340">"पूर्ण करने के लिए अन्य उपकरण टैप करें"</string>
+    <string name="default_pay_app_removed" msgid="4108250545457437360">"टैप करके पेमेंट करने के लिए आपकी पसंदीदा सेवा को निकाल दिया गया था. कोई अन्‍य चुनें?"</string>
+    <string name="ask_nfc_tap" msgid="2925239870458286340">"पूर्ण करने के लिए अन्य डिवाइस टैप करें"</string>
     <string name="wifi_connect" msgid="6250727951843550671">"कनेक्ट करें"</string>
     <string name="status_unable_to_connect" msgid="9183908200295307657">"नेटवर्क से कनेक्‍ट करने में असमर्थ"</string>
     <string name="status_wifi_connected" msgid="5893022897732105739">"कनेक्ट किया गया"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"नेटवर्क से कनेक्‍ट करें"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> नेटवर्क से कनेक्ट करें?"</string>
-    <!-- no translation found for beam_requires_nfc_enabled (2800366967218600534) -->
-    <skip />
-    <!-- no translation found for beam_requires_beam_enabled (5620935068991096814) -->
-    <skip />
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android Beam के लिए NFC को सक्षम किया जाना आवश्यक है. क्या आप उसे सक्षम करना चाहते हैं?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
 </resources>
diff --git a/res/values-hr/provisioning.xml b/res/values-hr/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-hr/provisioning.xml
+++ b/res/values-hr/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 8aa0518..863d4b1 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"Dodirnite za prikaz"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Uređaj prijamnika ne podržava prijenos velikih datoteka emitiranjem."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Opet povežite uređaje"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"Povezivanje"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"Povezan"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"Spajanje nije bilo moguće"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"Prekid veze"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"Prekinuta veza"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"Uparivanje"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"Uparivanje nije bilo moguće"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Beam je trenutačno zauzet. Pokušajte ponovo po dovršetku prethodnog prijenosa."</string>
+    <string name="device" msgid="4459621591392478151">"uređaj"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"Povezivanje s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"Uređaj <xliff:g id="DEVICE_NAME">%1$s</xliff:g> povezan je"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"Uređaj <xliff:g id="DEVICE_NAME">%1$s</xliff:g> nije povezan"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"Prekidanje veze s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"Prekinuta je veza s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"Uparivanje uređaja <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"Uređaj <xliff:g id="DEVICE_NAME">%1$s</xliff:g> nije uparen"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"Omogućavanje Bluetootha nije bilo moguće"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"Jeste li sigurni da želite upariti Bluetooth uređaj <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"Da"</string>
@@ -42,8 +44,6 @@
     <string name="status_wifi_connected" msgid="5893022897732105739">"Povezano"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"Povezivanje s mrežom"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"Želite li se povezati s mrežom <xliff:g id="NETWORK_SSID">%1$s</xliff:g>?"</string>
-    <!-- no translation found for beam_requires_nfc_enabled (2800366967218600534) -->
-    <skip />
-    <!-- no translation found for beam_requires_beam_enabled (5620935068991096814) -->
-    <skip />
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android Beam zahtijeva da bude omogućena funkcija NFC. Želite li je omogućiti?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
 </resources>
diff --git a/res/values-hu/provisioning.xml b/res/values-hu/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-hu/provisioning.xml
+++ b/res/values-hu/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index ac168eb..28b02f5 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"A megtekintéshez érintse meg."</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"A fogadó eszköz nem támogatja a nagyméretű fájlok átvitelét adatsugárzás útján."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Eszközök újbóli összekapcsolása"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"Csatlakozás"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"Csatlakozva"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"A kapcsolódás sikertelen"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"Szétkapcsolás"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"Szétkapcsolva"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"Párosítás"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"Nem sikerült a párosítás"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"A Beam jelenleg elfoglalt. Próbálja újra, ha az előző átvitel már befejeződött."</string>
+    <string name="device" msgid="4459621591392478151">"eszköz"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"Csatlakozás a következőhöz: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"Csatlakozva a következőhöz: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"Nem sikerült csatlakozni ehhez: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"Leválasztás a következőről: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"Leválasztva a következőről: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"Párosítás a következővel: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"Nem sikerült a párosítás ezzel: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"Nem lehet aktiválni a Bluetootht"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"Biztosan párosítani szeretné a(z) <xliff:g id="DEVICE_NAME">%1$s</xliff:g> Bluetooth-eszközt?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"Igen"</string>
@@ -42,8 +44,6 @@
     <string name="status_wifi_connected" msgid="5893022897732105739">"Csatlakozva"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"Csatlakozás hálózathoz"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"Csatlakozik a következő hálózathoz: <xliff:g id="NETWORK_SSID">%1$s</xliff:g>?"</string>
-    <!-- no translation found for beam_requires_nfc_enabled (2800366967218600534) -->
-    <skip />
-    <!-- no translation found for beam_requires_beam_enabled (5620935068991096814) -->
-    <skip />
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Az Android Beam használatához engedélyezni kell az NFC-t. Engedélyezi?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
 </resources>
diff --git a/res/values-hy-rAM/provisioning.xml b/res/values-hy-rAM/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-hy-rAM/provisioning.xml
+++ b/res/values-hy-rAM/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 8b9413e..2b32b45 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"Հպեք՝ դիտելու համար"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Ընդունողի սարքը չի աջակցում ռադիոհաղորդմամբ մեծ ֆայլերի փոխանցումը:"</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Սարքերը կրկին միմյանց հետ կցել"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"Միանում է"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"Միացված է"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"Չհաջողվեց միանալ"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"Անջատվում է"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"Անջատված է"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"Զուգավորում"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"Չհաջողվեց զուգավորել"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Այս պահին տվյալների փոխանցումը զբաղված է: Փորձեք կրկին նախորդ փոխանցումը ավարտելուց հետո:"</string>
+    <string name="device" msgid="4459621591392478151">"սարք"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>-ի կապակցում"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> սարքը կապակցված է"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"Չհաջողվեց կապակցել <xliff:g id="DEVICE_NAME">%1$s</xliff:g> սարքը"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>-ի կապախզում"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> սարքը կապախզված է"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>-ի զուգավորում"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"Չհաջողվեց զուգավորել <xliff:g id="DEVICE_NAME">%1$s</xliff:g> սարքը"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"Չհաջողվեց միացնել Bluetooth-ը"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"Վստա՞հ եք, որ ցանկանում եք զուգավորել <xliff:g id="DEVICE_NAME">%1$s</xliff:g> Bluetooth սարքը:"</string>
     <string name="pair_yes" msgid="3525614878559994448">"Այո"</string>
@@ -42,6 +44,6 @@
     <string name="status_wifi_connected" msgid="5893022897732105739">"Միացված է"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"Միանալ ցանցին"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"Միանա՞լ <xliff:g id="NETWORK_SSID">%1$s</xliff:g> ցանցին:"</string>
-    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android Ճառագայթման համար անհրաժեշտ է միացնել NFC-ն: Ցանկանո՞ւմ եք միացնել այն:"</string>
-    <string name="beam_requires_beam_enabled" msgid="5620935068991096814">"Android Ճառագայթումը կարգավորումներում միացված չէ: Ցանկանո՞ւմ եք միացնել այն:"</string>
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Որպեսզի Android Beam-ն աշխատի, անհրաժեշտ է միացնել NFC-ն: Ցանկանո՞ւմ եք միացնել այն:"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
 </resources>
diff --git a/res/values-in/provisioning.xml b/res/values-in/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-in/provisioning.xml
+++ b/res/values-in/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index c4132ae..f1cf98c 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"Sentuh untuk melihat"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Perangkat penerima tidak mendukung transfer file besar melalui beam."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Kumpulkan lagi perangkatnya"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"Menyambungkan"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"Tersambung"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"Tidak dapat menyambung"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"Memutuskan"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"Terputus"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"Menyandingkan"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"Tidak dapat menyandingkan"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Beam sedang sibuk. Coba lagi jika transfer sebelumnya telah selesai."</string>
+    <string name="device" msgid="4459621591392478151">"perangkat"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"Menghubungkan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> terhubung"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"Tidak dapat menghubungkan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"Memutuskan hubungan dengan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"Hubungan dengan <xliff:g id="DEVICE_NAME">%1$s</xliff:g> terputus"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"Menyandingkan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"Tidak dapat menyandingkan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"Tidak dapat mengaktifkan Bluetooth"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"Yakin ingin menyandingkan perangkat Bluetooth <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"Ya"</string>
@@ -42,8 +44,6 @@
     <string name="status_wifi_connected" msgid="5893022897732105739">"Tersambung"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"Sambungkan ke jaringan"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"Sambungkan ke jaringan <xliff:g id="NETWORK_SSID">%1$s</xliff:g>?"</string>
-    <!-- no translation found for beam_requires_nfc_enabled (2800366967218600534) -->
-    <skip />
-    <!-- no translation found for beam_requires_beam_enabled (5620935068991096814) -->
-    <skip />
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android Beam memerlukan NFC untuk diaktifkan. Ingin mengaktifkannya?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
 </resources>
diff --git a/res/values-is-rIS/provisioning.xml b/res/values-is-rIS/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-is-rIS/provisioning.xml
+++ b/res/values-is-rIS/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index 82830ba..96eb6d7 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"Snertu til að skoða"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Tæki viðtakandans styður ekki flutning stórra skráa með NFC."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Settu tækin hvort upp að öðru aftur"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"Tengist"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"Tengt"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"Tenging mistókst"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"Aftengist"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"Aftengt"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"Parar"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"Ekki var hægt að para"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Beam er upptekið. Reyndu aftur þegar fyrri flutningi er lokið."</string>
+    <string name="device" msgid="4459621591392478151">"tæki"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"Tengist <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"Tengt við <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"Ekki var hægt að tengjast <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"Aftengist frá <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"Aftengt frá <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"Parast við <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"Ekki var hægt að parast við <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"Ekki var hægt að kveikja á Bluetooth"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"Ertu viss um að þú viljir para Bluetooth-tækið <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"Já"</string>
@@ -43,5 +45,5 @@
     <string name="title_connect_to_network" msgid="2474034615817280146">"Tengjast neti"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"Tengjast netinu <xliff:g id="NETWORK_SSID">%1$s</xliff:g>?"</string>
     <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android Beam krefst þess að kveikt sé á NFC. Viltu kveikja á því?"</string>
-    <string name="beam_requires_beam_enabled" msgid="5620935068991096814">"Ekki er kveikt á Android Beam í stillingunum. Viltu kveikja á því?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
 </resources>
diff --git a/res/values-it/provisioning.xml b/res/values-it/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-it/provisioning.xml
+++ b/res/values-it/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index f51a822..161cfa6 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"Tocca per visualizzare"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Il dispositivo del destinatario non supporta il trasferimento di file di grandi dimensioni tramite Android Beam."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Avvicina di nuovo i dispositivi"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"Collegamento in corso"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"Collegato"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"Impossibile connettersi"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"Scollegamento in corso"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"Scollegato"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"Accoppiamento"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"Impossibile accoppiare"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Beam è occupato al momento. Riprova al termine del trasferimento precedente."</string>
+    <string name="device" msgid="4459621591392478151">"dispositivo"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"Collegamento di <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> collegato"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"Impossibile collegare <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"Scollegamento di <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> scollegato"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"Accoppiamento di <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"Impossibile accoppiare <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"Impossibile attivare il Bluetooth"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"Vuoi accoppiare il dispositivo Bluetooth <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"Sì"</string>
@@ -42,8 +44,6 @@
     <string name="status_wifi_connected" msgid="5893022897732105739">"Collegamento avvenuto"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"Connetti a rete"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"Connettere alla rete <xliff:g id="NETWORK_SSID">%1$s</xliff:g>?"</string>
-    <!-- no translation found for beam_requires_nfc_enabled (2800366967218600534) -->
-    <skip />
-    <!-- no translation found for beam_requires_beam_enabled (5620935068991096814) -->
-    <skip />
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"L\'attivazione della funzione Android Beam richiede la tecnologia NFC. Vuoi attivarla?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
 </resources>
diff --git a/res/values-iw/provisioning.xml b/res/values-iw/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-iw/provisioning.xml
+++ b/res/values-iw/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index c0e6354..936d1b0 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"גע כדי להציג"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"המכשיר המקבל אינו תומך בהעברת קובץ גדול באמצעות קרן."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"קרב שוב את המכשירים"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"מתחבר"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"מחובר"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"לא ניתן להתחבר."</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"מתנתק"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"מנותק"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"התאמה"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"לא ניתן לבצע התאמה"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"‏Beam אינו פנוי כעת. נסה שוב לאחר השלמת ההעברה הקודמת."</string>
+    <string name="device" msgid="4459621591392478151">"מכשיר"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"מתחבר אל <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"מחובר אל <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"לא ניתן להתחבר אל <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"מתנתק מ-<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"מנותק מ-<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"מבצע התאמה עם <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"לא ניתן לבצע התאמה עם <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"‏לא ניתן להפעיל Bluetooth"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"‏האם אתה בטוח שאתה רוצה להתאים את מכשיר ה-Bluetooth <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"כן"</string>
@@ -43,5 +45,5 @@
     <string name="title_connect_to_network" msgid="2474034615817280146">"התחבר לרשת"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"להתחבר לרשת <xliff:g id="NETWORK_SSID">%1$s</xliff:g>?"</string>
     <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"‏כדי להשתמש ב-Android Beam נדרשת הפעלה של NFC. האם ברצונך להפעיל אותו?"</string>
-    <string name="beam_requires_beam_enabled" msgid="5620935068991096814">"‏Android Beam אינו מופעל בהגדרות. האם ברצונך להפעיל אותו?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
 </resources>
diff --git a/res/values-ja/provisioning.xml b/res/values-ja/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-ja/provisioning.xml
+++ b/res/values-ja/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index d2c219b..88d193a 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"タップして表示"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"受信側の端末は、ビーム経由のサイズの大きなファイルの転送をサポートしていません。"</string>
     <string name="beam_try_again" msgid="3364677301009783455">"端末同士をもう一度近づける"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"接続中"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"接続されました"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"接続できませんでした"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"切断中"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"切断されました"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"ペア設定"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"ペア設定できませんでした"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"ビームは現在使用中です。前回の転送が完了したら、もう一度お試しください。"</string>
+    <string name="device" msgid="4459621591392478151">"端末"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>を接続しています"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>を接続しました"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>を接続できませんでした"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>を切断しています"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>を切断しました"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>をペア設定しています"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>をペア設定できませんでした"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"Bluetoothを有効にできませんでした"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"Bluetoothデバイス<xliff:g id="DEVICE_NAME">%1$s</xliff:g>をペアに設定してもよろしいですか?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"はい"</string>
@@ -35,15 +37,13 @@
     <string name="could_not_use_app" msgid="8137587876138569083">"<xliff:g id="APP">%1$s</xliff:g>を使用できませんでした。"</string>
     <string name="pay_with" msgid="5531545488795798945">"お支払い:"</string>
     <string name="complete_with" msgid="6797459104103012992">"完了:"</string>
-    <string name="default_pay_app_removed" msgid="4108250545457437360">"「タップしてお支払い」用のサービスが削除されました。別のサービスを選択しますか?"</string>
+    <string name="default_pay_app_removed" msgid="4108250545457437360">"「タップ&ペイ」用のサービスが削除されました。別のサービスを選択しますか?"</string>
     <string name="ask_nfc_tap" msgid="2925239870458286340">"完了するには別の端末をタップしてください"</string>
     <string name="wifi_connect" msgid="6250727951843550671">"接続"</string>
     <string name="status_unable_to_connect" msgid="9183908200295307657">"ネットワークに接続できません"</string>
     <string name="status_wifi_connected" msgid="5893022897732105739">"接続済み"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"ネットワークに接続"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"ネットワーク<xliff:g id="NETWORK_SSID">%1$s</xliff:g>に接続しますか?"</string>
-    <!-- no translation found for beam_requires_nfc_enabled (2800366967218600534) -->
-    <skip />
-    <!-- no translation found for beam_requires_beam_enabled (5620935068991096814) -->
-    <skip />
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Androidビームを使用するにはNFCを有効にする必要があります。有効にしますか?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Androidビーム"</string>
 </resources>
diff --git a/res/values-ka-rGE/provisioning.xml b/res/values-ka-rGE/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-ka-rGE/provisioning.xml
+++ b/res/values-ka-rGE/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 924a041..8b06c0d 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"შეეხეთ სანახავად"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"მიმღების მოწყობილობას დიდი ფაილების სხივით გადაცემის მხარდაჭერა არ გააჩნია."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"ისევ მიაახლოვეთ მოწყობილობები ერთმანეთს"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"მიმდინარეობს დაკავშირება"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"დაკავშირებულია"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"დაკავშირება ვერ მოხერხდა"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"მიმდინარეობს გათიშვა"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"კავშირი გაწყვეტილია"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"დაწყვილება…"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"დაწყვილება ვერ მოხერხდა"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"სხივი ამჟამად დაკავებულია. სცადეთ ხელახლა, როდესაც წინა გადაცემა დასრულდება."</string>
+    <string name="device" msgid="4459621591392478151">"მოწყობილობა"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"უკავშირდება <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"დაკავშირებულია <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"ვერ ვუკავშირდებით <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"კავშირი წყდება <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"გათიშულია <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"დაწყვილება <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"ვერ წყვილდება <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"Bluetooth-ის გააქტიურება ვერ მოხერხდა"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"დარწმუნებული ხართ, რომ გსურთ დააწყვილოთ Bluetooth მოწყობილობა <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"დიახ"</string>
@@ -43,5 +45,5 @@
     <string name="title_connect_to_network" msgid="2474034615817280146">"ქსელთან დაკავშირება"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"გსურთ <xliff:g id="NETWORK_SSID">%1$s</xliff:g> ქსელთან დაკავშირება?"</string>
     <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android Beam საჭიროებს NFC ჩართვას. გსურთ მისი ჩართვა?"</string>
-    <string name="beam_requires_beam_enabled" msgid="5620935068991096814">"Android Beam პარამეტრებში ჩართული არ არის. გსურთ მისი ჩართვა?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android სხივი"</string>
 </resources>
diff --git a/res/values-kk-rKZ/provisioning.xml b/res/values-kk-rKZ/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-kk-rKZ/provisioning.xml
+++ b/res/values-kk-rKZ/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index 3ded20a..e09ae03 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"Көру үшін түрту"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Хабар алушының құрылғысы бим арқылы үлкен файл жіберуді қолдамайды."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Құрылғыларды қайта біріктіру"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"Қосылуда"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"Жалғанған"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"Жалғау мүмкін болмады"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"Ажыратылуда…"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"Ажыратылған"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"Жұптауда..."</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"Жұптау мүмкін болмады"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Тарату қазіргі уақытта бос емес. Алдыңғы тасымалдау аяқталғанда әрекетті қайталаңыз."</string>
+    <string name="device" msgid="4459621591392478151">"құрылғы"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"Connecting <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"Connected <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"Could not connect <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"Disconnecting <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"Disconnected <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"Pairing <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"Could not pair <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"Bluetooth байланысын қосу мүмкін болмады."</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"Bluetooth құрылғысын <xliff:g id="DEVICE_NAME">%1$s</xliff:g> құрылғысымен жұптауды қалайсыз ба?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"Иә"</string>
@@ -42,8 +44,6 @@
     <string name="status_wifi_connected" msgid="5893022897732105739">"Қосылды"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"Желіге қосылу"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> желісіне қосылу керек пе?"</string>
-    <!-- no translation found for beam_requires_nfc_enabled (2800366967218600534) -->
-    <skip />
-    <!-- no translation found for beam_requires_beam_enabled (5620935068991096814) -->
-    <skip />
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android Beam NFC функциясының қосылған болуын қажет етеді. Оны қосу керек пе?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
 </resources>
diff --git a/res/values-km-rKH/provisioning.xml b/res/values-km-rKH/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-km-rKH/provisioning.xml
+++ b/res/values-km-rKH/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index ed04990..f6d4625 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"ប៉ះ​ដើម្បី​មើល"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"ឧបករណ៍​របស់​អ្នក​ទទួល​មិន​គាំទ្រ​ការ​ផ្ទេរ​ឯកសារ​​ដែល​មាន​ទំហំ​ធំ​តាម​ការ​ផ្ទេរ​ឡើយ។"</string>
     <string name="beam_try_again" msgid="3364677301009783455">"នាំ​ឧបករណ៍​ជាមួយគ្នា​ម្ដងទៀត"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"តភ្ជាប់"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"បាន​តភ្ជាប់"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"មិន​អាច​តភ្ជាប់។"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"កំពុង​ផ្ដាច់..."</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"បាន​ផ្ដាច់"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"ផ្គូផ្គង​"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"មិន​អាច​ផ្គូផ្គង"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"ប៊ីមកំពុងជាប់រវល់។ សាកល្បងម្តងទៀតនៅពេលដែលការផ្ទេរពីមុនបញ្ចប់។"</string>
+    <string name="device" msgid="4459621591392478151">"ឧបករណ៍"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"កំពុងភ្ជាប់ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"បានភ្ជាប់ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"មិនអាចភ្ជាប់ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> បានទេ"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"កំពុងផ្តាច់ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"បានផ្តាច់ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"កំពុងភ្ជាប់ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"មិនអាចភ្ជាប់ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> បានទេ"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"មិន​អាច​បើក​ប៊្លូធូស"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"តើ​អ្នក​ប្រាកដ​ជា​ចង់​ផ្គូផ្គង​ឧបករណ៍​ប៊្លូធូស <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"បាទ/ចាស"</string>
@@ -43,5 +45,5 @@
     <string name="title_connect_to_network" msgid="2474034615817280146">"​ភ្ជាប់​បណ្ដាញ"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"ភ្ជាប់​បណ្ដាញ <xliff:g id="NETWORK_SSID">%1$s</xliff:g>?"</string>
     <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android Beam ទាមទារ​ឲ្យ​បើក NFC ។ តើ​អ្នក​ចង់​បើក​វា​ឬ?"</string>
-    <string name="beam_requires_beam_enabled" msgid="5620935068991096814">"មិន​បាន​បើក Android Beam ក្នុង​ការ​កំណត់។ តើ​អ្នក​ចង់​បើ​វា​ឬ?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
 </resources>
diff --git a/res/values-kn-rIN/provisioning.xml b/res/values-kn-rIN/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-kn-rIN/provisioning.xml
+++ b/res/values-kn-rIN/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 72b3db9..9dfe6d3 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"ವೀಕ್ಷಿಸಲು ಸ್ಪರ್ಶಿಸಿ"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"ಸ್ವೀಕರಿಸುವವರ ಸಾಧನವು ಬೀಮ್ ಮೂಲಕ ಮಾಡಲಾಗುವ ವರ್ಗಾವಣೆಯನ್ನು ಬೆಂಬಲಿಸುವುದಿಲ್ಲ."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"ಸಾಧನಗಳನ್ನು ಮತ್ತೆ ಒಟ್ಟಿಗೆ ತನ್ನಿ"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"ಸಂಪರ್ಕಿಸಲಾಗುತ್ತಿದೆ"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"ಸಂಪರ್ಕಗೊಂಡಿದೆ"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"ಸಂಪರ್ಕಿಸಲು ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸಲಾಗುತ್ತಿದೆ"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸಲಾಗಿದೆ"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"ಜೋಡಿಸುವಿಕೆ"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"ಜೋಡಿಸಲು ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"ಬೀಮ್ ಪ್ರಸ್ತುತ ಕಾರ್ಯನಿರತವಾಗಿದೆ. ಹಿಂದಿನ ವರ್ಗಾವಣೆ ಪೂರ್ಣಗೊಂಡ ಬಳಿಕ ಮತ್ತೊಮ್ಮೆ ಪ್ರಯತ್ನಿಸಿ."</string>
+    <string name="device" msgid="4459621591392478151">"ಸಾಧನ"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ಸಾಧನವನ್ನು ಸಂಪರ್ಕಿತಗೊಳಿಸಲಾಗುತ್ತಿದೆ"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ಸಾಧನವನ್ನು ಸಂಪರ್ಕಿತಗೊಳಿಸಲಾಗಿದೆ"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ಸಾಧನವನ್ನು ಸಂಪರ್ಕಿತಗೊಳಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ಸಾಧನವನ್ನು ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸಲಾಗುತ್ತಿದೆ"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ಸಾಧನವನ್ನು ಸಂಪರ್ಕಕಡಿತಗೊಳಿಸಲಾಗಿದೆ"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ಸಾಧನವನ್ನು ಜೋಡಣೆ ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ಸಾಧನವನ್ನು ಜೋಡಣೆ ಮಾಡಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"ಬ್ಲೂಟೂತ್ ಸಕ್ರಿಯಗೊಳಿಸಲು ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"ನೀವು <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ಬ್ಲೂಟೂತ್ ಸಾಧನವನ್ನು ಜೋಡಿಸಲು ಖಚಿತವಾಗಿ ಬಯಸುವಿರಾ?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"ಹೌದು"</string>
@@ -42,8 +44,6 @@
     <string name="status_wifi_connected" msgid="5893022897732105739">"ಸಂಪರ್ಕಗೊಂಡಿದೆ"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"ನೆಟ್‌ವರ್ಕ್‌ಗೆ ಸಂಪರ್ಕಪಡಿಸಿ"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> ನೆಟ್‌ವರ್ಕ್‌ಗೆ ಸಂಪರ್ಕಿಸುವುದೇ?"</string>
-    <!-- no translation found for beam_requires_nfc_enabled (2800366967218600534) -->
-    <skip />
-    <!-- no translation found for beam_requires_beam_enabled (5620935068991096814) -->
-    <skip />
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android Beam ಬಳಸಲು NFC ಸಕ್ರಿಯಗೊಂಡಿರಬೇಕು. ನೀವದನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲು ಬಯಸುವಿರಾ?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
 </resources>
diff --git a/res/values-ko/provisioning.xml b/res/values-ko/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-ko/provisioning.xml
+++ b/res/values-ko/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 6e0eb90..e495e30 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"터치하여 보기"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"수신자의 기기는 빔을 통한 대용량 파일 전송을 지원하지 않습니다."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"기기 다시 공유"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"연결 중"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"연결됨"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"연결하지 못함"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"연결을 끊는 중"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"연결 끊김"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"페어링 중"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"페어링하지 못함"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"현재 공유 작업을 진행 중입니다. 기존 전송 작업이 완료되면 다시 시도하세요."</string>
+    <string name="device" msgid="4459621591392478151">"기기"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>에 연결하는 중"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>에 연결됨"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>에 연결할 수 없음"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>와(과) 연결 해제하는 중"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>와(과) 연결 해제됨"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>와(과) 페어링하는 중"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>와(과) 페어링할 수 없음"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"블루투스를 사용하도록 설정하지 못함"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"블루투스 기기 <xliff:g id="DEVICE_NAME">%1$s</xliff:g>을(를) 페어링하시겠습니까?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"예"</string>
@@ -42,8 +44,6 @@
     <string name="status_wifi_connected" msgid="5893022897732105739">"연결됨"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"네트워크 연결"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"네트워크 <xliff:g id="NETWORK_SSID">%1$s</xliff:g>에 연결하시겠습니까?"</string>
-    <!-- no translation found for beam_requires_nfc_enabled (2800366967218600534) -->
-    <skip />
-    <!-- no translation found for beam_requires_beam_enabled (5620935068991096814) -->
-    <skip />
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android Beam을 사용하려면 NFC를 사용 설정해야 합니다. NFC를 사용 설정하시겠습니까?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
 </resources>
diff --git a/res/values-ky-rKG/provisioning.xml b/res/values-ky-rKG/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-ky-rKG/provisioning.xml
+++ b/res/values-ky-rKG/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index 2cefafe..bb14bcf 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"Көрүш үчүн тийиңиз"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Алуучунун түзмөгү beam аркылуу чоң файлдарды кабылдабайт."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Түзмөктөрдү кайрадан бириктириңиз"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"Туташууда"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"Туташып турат"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"Туташа алган жок"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"Ажыратылууда"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"Ажыратылды"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"Жупташтыруу"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"Жупташтырылган жок"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Учурда өткөрүү бош эмес. Мурунку өткөрүү аяктаганда кайра аракет кылыңыз."</string>
+    <string name="device" msgid="4459621591392478151">"түзмөк"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> туташтырылууда"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> туташтырылды"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> менен туташа алган жок"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ажыратылууда"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ажыратылды"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> жупташтырылууда"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> жупташтырылбай койду"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"Bluetooth жандырылган жок"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> Bluetooth түзмөгү менен жупташтырууну каалаганыңыз аныкпы?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"Ооба"</string>
@@ -42,8 +44,6 @@
     <string name="status_wifi_connected" msgid="5893022897732105739">"Туташып турат"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"Тармакка туташуу"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> тармагына туташасызбы?"</string>
-    <!-- no translation found for beam_requires_nfc_enabled (2800366967218600534) -->
-    <skip />
-    <!-- no translation found for beam_requires_beam_enabled (5620935068991096814) -->
-    <skip />
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android Beam NFC иштетилишин талап кылат. Аны иштетесизби?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
 </resources>
diff --git a/res/values-lo-rLA/provisioning.xml b/res/values-lo-rLA/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-lo-rLA/provisioning.xml
+++ b/res/values-lo-rLA/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index e33f878..5746e9e 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"ແຕະ​ເພື່ອ​ເບິ່ງ"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"ອຸປະກອນຂອງຜູ່ຮັບບໍ່ສາມາດຮອງຮັບການໂອນໄຟລ໌ຂະຫນາດໃຫຍ່ໂດຍຜ່ານ beam ໄດ້."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"ນຳອຸປະກອນເຂົ້າມາຫາກັນໃໝ່ອີກຄັ້ງ"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"ກຳລັງເຊື່ອມຕໍ່"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"ເຊື່ອມ​ຕໍ່ແລ້ວ"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"ບໍ່ສາມາດເຊື່ອມຕໍ່ໄດ້"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"ກຳລັງຕັດການເຊື່ອມຕໍ່"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"ຕັດການເຊື່ອມຕໍ່ແລ້ວ"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"ກຳລັງຈັບຄູ່..."</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"ບໍ່ສາມາດຈັບຄູ່ໄດ້"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"ປະ​ຈຸ​ບັນ Beam ບໍ່​ວ່າງ. ລອງ​ໃໝ່​ອີກ​ເມື່ອ​ການ​ໂອນທີ່​ຜ່ານ​ມາ​ສຳ​ເລັດແລ້ວ."</string>
+    <string name="device" msgid="4459621591392478151">"ອຸປະກອນ"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"ກຳ​ລັງ​ເຊື່ອມ​ຕໍ່ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ທີ່​ເຊື່ອມ​ຕໍ່​ແລ້ວ"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"ບໍ່​ສາມ​າດ​ເຊື່ອ​ມ​ຕໍ່​ກັບ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ໄດ້"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"ກຳ​ລັງ​ຕັດ​ເຊື່ອມ​ຕໍ່ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ທີ່​ຕັດ​ເຊື່ອມ​ຕໍ່​ແລ້ວ"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"ກຳ​ລັງ​ຈັບ​ຄູ່ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"ບໍ່​ສາ​ມາດ​ຈັບ​ຄູ່ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ໄດ້"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"ບໍ່ສາມາດເປີດນຳໃຊ້ Bluetooth ໄດ້"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"ທ່ານແນ່ໃຈບໍວ່າທ່ານຕ້ອງການຈັບຄູ່ອຸປະກອນ Bluetooth <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"ຕົກລົງ"</string>
@@ -43,5 +45,5 @@
     <string name="title_connect_to_network" msgid="2474034615817280146">"ເຊື່ອມຕໍ່ກັບເຄືອຂ່າຍ"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"​ເຊື່ອມ​ຕໍ່​ກັບ​ເຄືອ​ຂ່າຍ <xliff:g id="NETWORK_SSID">%1$s</xliff:g> ບໍ?"</string>
     <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android Beam ຕ້ອງ​ໃຊ້ NFC. ທ່ານ​ຕ້ອງ​ການ​ເປີດ​ໃຊ້ NFC ບໍ່?"</string>
-    <string name="beam_requires_beam_enabled" msgid="5620935068991096814">"Android Beam ບໍ່​ໄດ້​ຖືກ​ເປີດ​ນຳ​ໃຊ້​ໃນ​ການ​ຕັ້ງ​ຄ່າ. ທ່ານ​ຕ້ອງ​ການ​ເປີດ​ໃຊ້​ມັນ​ບໍ່?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
 </resources>
diff --git a/res/values-lt/provisioning.xml b/res/values-lt/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-lt/provisioning.xml
+++ b/res/values-lt/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index e35d26d..a00419c 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"Jei norite peržiūrėti, palieskite"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Gavėjo įrenginyje nepalaikomas didelio failo perdavimas naudojant perdavimo funkciją."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Vėl susiekite įrenginius"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"Prisijungiama"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"Prisijungta"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"Nepavyko prisijungti"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"Atsijungiama"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"Atsijungta"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"Susiejama"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"Nepavyko susieti"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Perdavimo paslauga šiuo metu užimta. Bandykite dar kartą, kai bus baigtas ankstesnis perkėlimas."</string>
+    <string name="device" msgid="4459621591392478151">"įrenginys"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"Jungiamasi prie „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"Prisijungta prie „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"Nepavyko prisijungti prie „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"Atsijungiama nuo „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"Atsijungta nuo „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"Susiejama su „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"Nepavyko susieti su „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"Nepavyko įgalinti „Bluetooth“"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"Ar tikrai norite susieti „Bluetooth“ įrenginį „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"Taip"</string>
@@ -42,8 +44,6 @@
     <string name="status_wifi_connected" msgid="5893022897732105739">"Prisijungta"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"Prisijungti prie tinklo"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"Prisijungti prie tinklo „<xliff:g id="NETWORK_SSID">%1$s</xliff:g>“?"</string>
-    <!-- no translation found for beam_requires_nfc_enabled (2800366967218600534) -->
-    <skip />
-    <!-- no translation found for beam_requires_beam_enabled (5620935068991096814) -->
-    <skip />
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Norint naudoti „Android“ perdavimo funkciją, būtina įgalinti ALR. Ar norite įgalinti šią funkciją?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"„Android“ perdavimas"</string>
 </resources>
diff --git a/res/values-lv/provisioning.xml b/res/values-lv/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-lv/provisioning.xml
+++ b/res/values-lv/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index b1b4c4a..944757f 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"Pieskarieties, lai skatītu."</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Saņēmēja ierīce neatbalsta lielu failu pārsūtīšanu, izmantojot funkciju Beam."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Vēlreiz novietojiet ierīces blakus."</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"Notiek savienojuma izveide"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"Savienojums izveidots"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"Nevarēja izveidot savienojumu"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"Notiek savienojuma pārtraukšana"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"Savienojums pārtraukts"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"Notiek savienošana pārī"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"Nevarēja savienot pārī"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Funkcija Beam šobrīd ir noslogota. Mēģiniet vēlreiz, tiklīdz ir pabeigta iepriekšējā pārsūtīšana."</string>
+    <string name="device" msgid="4459621591392478151">"ierīce"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"Notiek savienošana ar ierīci <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"Savienots ar ierīci <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"Nevarēja savienot ar ierīci <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"Notiek ierīces <xliff:g id="DEVICE_NAME">%1$s</xliff:g> atvienošana."</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"Ierīce <xliff:g id="DEVICE_NAME">%1$s</xliff:g> tika atvienota."</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"Notiek savienošana pārī ar ierīci <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"Nevarēja savienot pārī ar ierīci <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"Nevarēja iespējot Bluetooth"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"Vai tiešām vēlaties savienot pārī Bluetooth ierīci <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"Jā"</string>
@@ -42,8 +44,6 @@
     <string name="status_wifi_connected" msgid="5893022897732105739">"Savienojums ir izveidots."</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"Savienojuma izveide ar tīklu"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"Vai izveidot savienojumu ar tīklu <xliff:g id="NETWORK_SSID">%1$s</xliff:g>?"</string>
-    <!-- no translation found for beam_requires_nfc_enabled (2800366967218600534) -->
-    <skip />
-    <!-- no translation found for beam_requires_beam_enabled (5620935068991096814) -->
-    <skip />
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Lai varētu iespējot funkciju Android Beam, ir vajadzīga tehnoloģija NFC. Vai vēlaties to iespējot?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
 </resources>
diff --git a/res/values-mk-rMK/provisioning.xml b/res/values-mk-rMK/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-mk-rMK/provisioning.xml
+++ b/res/values-mk-rMK/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index db3bf89..36c8b9b 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"Допри за да видиш"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Уредот на примачот не поддржува пренос на големи датотеки преку зрак."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Повторно спој ги уредите"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"Се поврзува"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"Поврзана"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"Не можеше да се поврзе"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"Се исклучува"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"Исклучена"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"Спарување"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"Не можеше да се спарат"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Beam е моментално зафатен. Обидете се повторно кога ќе заврши претходниот пренос."</string>
+    <string name="device" msgid="4459621591392478151">"уред"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"Се поврзува <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> e поврзан"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"Не можеше да се поврзе со <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"Се исклучува <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> е исклучен"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"Се спарува <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"Не можеше да се спари <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"Не може да се овозможи Bluetooth"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"Дали сте сигурни дека сакате да го спарите уредот со Bluetooth <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"Да"</string>
@@ -42,8 +44,6 @@
     <string name="status_wifi_connected" msgid="5893022897732105739">"Поврзано"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"Поврзи се на мрежа"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"Да се поврзе со мрежата <xliff:g id="NETWORK_SSID">%1$s</xliff:g>?"</string>
-    <!-- no translation found for beam_requires_nfc_enabled (2800366967218600534) -->
-    <skip />
-    <!-- no translation found for beam_requires_beam_enabled (5620935068991096814) -->
-    <skip />
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android Beam бара да се овозможи НФЦ. Дали сакате да го овозможите?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
 </resources>
diff --git a/res/values-ml-rIN/provisioning.xml b/res/values-ml-rIN/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-ml-rIN/provisioning.xml
+++ b/res/values-ml-rIN/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index 604a290..6b9a83b 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -18,15 +18,17 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"കാണാൻ സ്‌പർശിക്കുക"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"ബീം മുഖേന വലിയ ഫയൽ കൈമാറുന്നതിനെ സ്വീകർത്താവിന്റെ ഉപകരണം പിന്തുണയ്ക്കുന്നില്ല."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"ഉപകരണങ്ങൾ വീണ്ടും ഒരുമിച്ചുകൊണ്ടുവരുക"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"കണക്റ്റുചെയ്യുന്നു"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"കണക്റ്റുചെയ്‌തു"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"കണക്‌റ്റുചെയ്യാനായില്ല"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"വിച്‌ഛേദിക്കുന്നു"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"വിച്ഛേദിച്ചു"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"ജോടിയാക്കുന്നു"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"ജോടിയാക്കാനായില്ല"</string>
-    <string name="failed_to_enable_bt" msgid="7229153323594758077">"Bluetooth പ്രവർത്തനക്ഷമമാക്കാനായില്ല"</string>
-    <string name="confirm_pairing" msgid="4112568077038265363">"നിങ്ങൾക്ക് <xliff:g id="DEVICE_NAME">%1$s</xliff:g> എന്ന Bluetooth ഉപകരണം ജോടിയാക്കണമെന്ന് തീർച്ചയാണോ?"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"ബീം നിലവിൽ തിരക്കിലാണ്. മുമ്പുള്ള കൈമാറ്റം പൂർത്തിയാക്കുമ്പോൾ വീണ്ടും ശ്രമിക്കുക."</string>
+    <string name="device" msgid="4459621591392478151">"ഉപകരണം"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>, കണക്‌റ്റുചെയ്യുന്നു"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>, കണക്‌റ്റുചെയ്‌തു"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>, കണക്‌റ്റുചെയ്യാനായില്ല"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>, വിച്‌ഛേദിക്കുന്നു"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>, വിച്‌ഛേദിച്ചു"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>, ജോടിയാക്കുന്നു"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>, ജോടിയാക്കാനായില്ല"</string>
+    <string name="failed_to_enable_bt" msgid="7229153323594758077">"ബ്ലൂടൂത്ത് പ്രവർത്തനക്ഷമമാക്കാനായില്ല"</string>
+    <string name="confirm_pairing" msgid="4112568077038265363">"നിങ്ങൾക്ക് <xliff:g id="DEVICE_NAME">%1$s</xliff:g> എന്ന ബ്ലൂടൂത്ത് ഉപകരണം ജോടിയാക്കണമെന്ന് തീർച്ചയാണോ?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"വേണം"</string>
     <string name="pair_no" msgid="5022308368904055020">"വേണ്ട"</string>
     <string name="tap_again_to_pay" msgid="5754988005412859897">"<xliff:g id="APP">%1$s</xliff:g> എന്നതുപയോഗിച്ച് പണമടയ്‌ക്കുന്നതിന് വീണ്ടും ടാപ്പുചെയ്യുക"</string>
@@ -35,15 +37,13 @@
     <string name="could_not_use_app" msgid="8137587876138569083">"<xliff:g id="APP">%1$s</xliff:g> ഉപയോഗിക്കാനായില്ല."</string>
     <string name="pay_with" msgid="5531545488795798945">"ഇതുപയോഗിച്ച് പണമടയ്‌ക്കുക"</string>
     <string name="complete_with" msgid="6797459104103012992">"ഇതുപയോഗിച്ച് പൂർത്തിയാക്കുക"</string>
-    <string name="default_pay_app_removed" msgid="4108250545457437360">"ടാപ്പുചെയ്‌ത് പണമടയ്‌ക്കുക എന്നതിനായി നിങ്ങൾ തിരഞ്ഞെടുത്ത സേവനം നീക്കംചെയ്‌തു. മറ്റൊന്ന് തിരഞ്ഞെടുക്കണോ?"</string>
+    <string name="default_pay_app_removed" msgid="4108250545457437360">"\'മൊബൈൽ തൊടീച്ച് പണമടയ്ക്കുക\' എന്നതിനായി നിങ്ങൾ തിരഞ്ഞെടുത്ത സേവനം നീക്കംചെയ്‌തു. മറ്റൊന്ന് തിരഞ്ഞെടുക്കണോ?"</string>
     <string name="ask_nfc_tap" msgid="2925239870458286340">"പൂർത്തിയാക്കുന്നതിന് മറ്റൊരു ഉപകരണം ടാപ്പുചെയ്യുക"</string>
     <string name="wifi_connect" msgid="6250727951843550671">"കണക്റ്റുചെയ്യുക"</string>
     <string name="status_unable_to_connect" msgid="9183908200295307657">"നെറ്റ്‌വർക്കിലേക്ക് കണക്റ്റുചെയ്യാനായില്ല"</string>
     <string name="status_wifi_connected" msgid="5893022897732105739">"കണക്റ്റുചെയ്‌തു"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"നെ‌റ്റ്‌വർക്കിൽ കണക്‌റ്റുചെയ്യുക"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> എന്ന നെറ്റ്‌വർക്കിലേക്ക് കണക്‌റ്റുചെയ്യണോ?"</string>
-    <!-- no translation found for beam_requires_nfc_enabled (2800366967218600534) -->
-    <skip />
-    <!-- no translation found for beam_requires_beam_enabled (5620935068991096814) -->
-    <skip />
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android ബീമിന്, NFC പ്രവർത്തനക്ഷമമാക്കേണ്ടതുണ്ട്. നിങ്ങൾക്കത് പ്രവർത്തനക്ഷമമാക്കണോ?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android ബീം"</string>
 </resources>
diff --git a/res/values-mn-rMN/provisioning.xml b/res/values-mn-rMN/provisioning.xml
index efcee84..7b21b72 100644
--- a/res/values-mn-rMN/provisioning.xml
+++ b/res/values-mn-rMN/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"аппликэйшн/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 464a4be..bb94efb 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"Харахын тулд хүрнэ үү"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Хүлээн авагч төхөөрөмж том файлыг бийм-ээр дамжуулахыг дэмждэггүй."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Төхөөрөмжүүдийг дахин хамтад нь байлгах"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"Холбогдож байна"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"Холбогдсон"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"Холбож чадсангүй"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"Салгаж байна"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"Салгагдсан"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"Хослуулж байна"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"Хослуулж чадсангүй"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Beam одоохондоо завгүй байна. Өмнөх шилжүүлэг дууссан үед дахин оролдоно уу."</string>
+    <string name="device" msgid="4459621591392478151">"төхөөрөмж"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>-г холбож байна"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>-г холбосон байна"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>-г холбож чадсангүй"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>-н холбоог салгаж байна"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>-н холбоог салгасан байна"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>-г хослуулан холбож байна"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>-г хослуулан холбож чадсангүй"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"Блютүүтийг идэвхжүүлж чадсангүй"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"Та Блютүүт төхөөрөмж <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-тэй хослуулахдаа итгэлтэй байна уу?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"Тийм"</string>
@@ -43,5 +45,5 @@
     <string name="title_connect_to_network" msgid="2474034615817280146">"Сүлжээнд холбогдох"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> сүлжээнд холбогдох уу?"</string>
     <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android Beam-г идэвхжүүлэхэд NFC шаардлагатай. Үүнийг идэвхжүүлэх үү?"</string>
-    <string name="beam_requires_beam_enabled" msgid="5620935068991096814">"Android Beam-г Тохиргоо дотор идэвхжүүлээгүй байна. Үүнийг идэвхжүүлэх үү?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Андройд Цацраг"</string>
 </resources>
diff --git a/res/values-mr-rIN/provisioning.xml b/res/values-mr-rIN/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-mr-rIN/provisioning.xml
+++ b/res/values-mr-rIN/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index 7b05d5b..0863e32 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -18,15 +18,17 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"पाहण्यासाठी स्पर्श करा"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"प्राप्तकर्त्याचे डिव्हाइस बीमद्वारे मोठी फाईल स्थानांतरीत करण्यास समर्थन देत नाही."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"डिव्हाइसेस पुन्हा एकत्र आणा"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"कनेक्ट करीत आहे"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"कनेक्ट केले"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"कनेक्ट करु शकलो नाही"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"डिस्कनेक्ट करत आहे"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"डिस्कनेक्ट केले"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"जोडत आहे"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"जोडू शकलो नाही"</string>
-    <string name="failed_to_enable_bt" msgid="7229153323594758077">"Bluetooth सक्षम करू शकलो नाही"</string>
-    <string name="confirm_pairing" msgid="4112568077038265363">"आपण <xliff:g id="DEVICE_NAME">%1$s</xliff:g> Bluetooth डिव्हाइस जोडू इच्छिता याची आपल्याला खात्री आहे?"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"बीम करणे सध्या व्यस्त आहे. मागील स्थानांतरीत करणे पूर्ण झाल्यानंतर पुन्हा प्रयत्न करा."</string>
+    <string name="device" msgid="4459621591392478151">"डिव्हाइस"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> कनेक्‍ट करीत आहे"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> कनेक्‍ट केले"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> कनेक्‍ट करणे शक्य झाले नाही"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> डिस्‍कनेक्‍ट करीत आहे"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> डिस्‍कनेक्‍ट केले"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> जोडणी करीत आहे"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> जोडणे शक्य झाले नाही"</string>
+    <string name="failed_to_enable_bt" msgid="7229153323594758077">"ब्लूटुथ सक्षम करू शकलो नाही"</string>
+    <string name="confirm_pairing" msgid="4112568077038265363">"आपण <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ब्लूटुथ डिव्हाइस जोडू इच्छिता याची आपल्याला खात्री आहे?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"होय"</string>
     <string name="pair_no" msgid="5022308368904055020">"नाही"</string>
     <string name="tap_again_to_pay" msgid="5754988005412859897">"<xliff:g id="APP">%1$s</xliff:g> सह देय देण्यासाठी पुन्हा टॅप करा"</string>
@@ -42,8 +44,6 @@
     <string name="status_wifi_connected" msgid="5893022897732105739">"कनेक्ट केले"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"नेटवर्कवर कनेक्ट करा"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> नेटवर्कशी कनेक्ट करायचे?"</string>
-    <!-- no translation found for beam_requires_nfc_enabled (2800366967218600534) -->
-    <skip />
-    <!-- no translation found for beam_requires_beam_enabled (5620935068991096814) -->
-    <skip />
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android Beam ला सक्षम करण्यासाठी NFC आवश्यक आहे. आपण हे सक्षम करू इच्छिता?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android बीम"</string>
 </resources>
diff --git a/res/values-ms-rMY/provisioning.xml b/res/values-ms-rMY/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-ms-rMY/provisioning.xml
+++ b/res/values-ms-rMY/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 6c8c1b3..caed039 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"Sentuh untuk melihat"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Peranti penerima tidak menyokong pemindahan fail besar melalui pancaran."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Dekatkan peranti semula"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"Menyambung"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"Disambungkan"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"Tidak dapat menyambung"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"Memutuskan sambungan"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"Diputuskan sambungan"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"Menjadikan pasangan"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"Tidak dapat berpasangan"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Pancaran sibuk pada masa ini. Cuba lagi apabila pemindahan sebelumnya selesai."</string>
+    <string name="device" msgid="4459621591392478151">"peranti"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"Menyambungkan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> disambungkan"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"Tidak dapat menyambungkan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"Memutuskan sambungan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> diputuskan sambungan"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"Memasangkan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"Tidak dapat memasangkan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"Tidak dapat mendayakan Bluetooth"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"Adakah anda pasti anda mahu memadankan peranti Bluetooth <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"Ya"</string>
@@ -42,6 +44,6 @@
     <string name="status_wifi_connected" msgid="5893022897732105739">"Disambungkan"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"Sambung kepada rangkaian"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"Sambung ke rangkaian <xliff:g id="NETWORK_SSID">%1$s</xliff:g>?"</string>
-    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Pancaran Android memerlukan NFC untuk didayakan. Adakah anda ingin dayakan?"</string>
-    <string name="beam_requires_beam_enabled" msgid="5620935068991096814">"Pancaran Android tidak didayakan dalam Tetapan. Adakah anda ingin dayakan?"</string>
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"NFC perlu didayakan untuk menggunakan Pancaran Android. Adakah anda ingin dayakan?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Pancaran Android"</string>
 </resources>
diff --git a/res/values-my-rMM/provisioning.xml b/res/values-my-rMM/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-my-rMM/provisioning.xml
+++ b/res/values-my-rMM/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index aa85ad8..6908d83 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -14,21 +14,23 @@
     <string name="beam_complete" msgid="477026736424637435">"လှိုင်းလွှင့်မှု ပြီးဆုံးပါပြီ"</string>
     <string name="beam_failed" msgid="5116241718189888630">"လှိုင်းလွှင့်မှု မပြီးဆုံးပါ"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"လှိုင်းလွှင့်မှု ပယ်ဖျက်မည်"</string>
-    <string name="cancel" msgid="61873902552555096">"ပယ်ဖျက်သည်"</string>
+    <string name="cancel" msgid="61873902552555096">"ထားတော့"</string>
     <string name="beam_touch_to_view" msgid="7853129156831642630">"ကြည့်ရန် တို့ထိပါ"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"လက်ခံစက်သည် လှိုင်းလွှင့်ခြင်းမှတစ်ဆင့် ကြီးမားသောဖိုင်လွဲခြင်းများကို မထောက်ပံ့ပါ"</string>
     <string name="beam_try_again" msgid="3364677301009783455">"ထပ်ပြီး စက်ကို အတူထားပါ"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"ချိတ်ဆက်နေသည်"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"ချိတ်ဆက်ထားပြီး"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"မချိတ်ဆက်နိုင်ပါ"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"အဆက်အသွယ်ဖြတ်တောက်နေသည်"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"ချိတ်ဆက်မှုပြတ်တောက်သည်"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"တွဲချိတ်နေသည်"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"တွဲချိတ်၍မရပါ"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Beam လောလောဆယ် အလုပ်များနေ၏။ ယခင် ကူးပြောင်းမှုပြီးမှ ထပ်မံကြိုးစားပါ။"</string>
+    <string name="device" msgid="4459621591392478151">"ကိရိယာ"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> အားချိတ်ဆက်နေ၏"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> အား ချိတ်ဆက်ပြီး"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> အား မချိတ်ဆက်နိုင်ပါ"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>အားချိတ်ဆက်မှုဖြတ်တောက်နေ၏"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> နှင့်မချိတ်ဆက်ထားပါ"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>နှင့်တွဲချိတ်နေ၏"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>နှင့်မတွဲချိတ်နိုင်ပါ"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"ဘလူးတုသ်ကို မရရှိနိုင်ပါ"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"ဘလူးတုသ်စက်<xliff:g id="DEVICE_NAME">%1$s</xliff:g>နှင့် တွဲချိတ်ရန် ကျိန်းသေပါသလား?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"မှန်ပါသည်"</string>
-    <string name="pair_no" msgid="5022308368904055020">"မဟုတ်ပါ"</string>
+    <string name="pair_no" msgid="5022308368904055020">"ဟင့်အင်း"</string>
     <string name="tap_again_to_pay" msgid="5754988005412859897">"<xliff:g id="APP">%1$s</xliff:g>နှင့် ပေးချေရန် နောက်တစ်ခါ ခေါက်ထိပါ"</string>
     <string name="tap_again_to_complete" msgid="5423640945118279123">"<xliff:g id="APP">%1$s</xliff:g>နှင့် ပြီးဆုံးရန် နောက်တစ်ခါ ခေါက်ထိပါ"</string>
     <string name="transaction_failure" msgid="7828102078637936513">"<xliff:g id="APP">%1$s</xliff:g>နှင့် လုပ်ငန်းစဥ်မပြီးဆုံးနိုင်ပါ"</string>
@@ -42,8 +44,6 @@
     <string name="status_wifi_connected" msgid="5893022897732105739">"ချိတ်ဆက်ထားပြီး"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"ကွန်ယက်ကို ဆက်သွယ်ရန်"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"ကွန်ရက် <xliff:g id="NETWORK_SSID">%1$s</xliff:g>ကို ချိတ်ဆက်ရမလား?"</string>
-    <!-- no translation found for beam_requires_nfc_enabled (2800366967218600534) -->
-    <skip />
-    <!-- no translation found for beam_requires_beam_enabled (5620935068991096814) -->
-    <skip />
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android Beam သင် NFC ဖွင့်ရန်လိုအပ်သည်။ သင်၎င်းအားဖွင့်လိုသလား?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"အန်ဒရွိုက် အလင်းတန်း"</string>
 </resources>
diff --git a/res/values-nb/provisioning.xml b/res/values-nb/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-nb/provisioning.xml
+++ b/res/values-nb/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index dec32bc..cea1dd0 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"Trykk for å se"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Mottakerens enhet støtter ikke store filoverføringer via Android Beam."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Før enhetene sammen igjen"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"Kobler til"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"Tilkoblet"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"Kunne ikke koble til"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"Frakobler"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"Frakoblet"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"Kobler til"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"Kunne ikke koble til"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Beam er opptatt for øyeblikket. Prøv igjen når den forrige overføringen er fullført."</string>
+    <string name="device" msgid="4459621591392478151">"enhet"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"Kobler til <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"Tilkoblet <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"Kunne ikke koble til <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"Kobler fra <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"Frakoblet <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"Sammenkobler <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"Kunne ikke sammenkoble <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"Kunne ikke aktivere Bluetooth"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"Er du sikker på at koble til Bluetooth-enheten <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"Ja"</string>
@@ -42,8 +44,6 @@
     <string name="status_wifi_connected" msgid="5893022897732105739">"Tilkoblet"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"Koble til nettverket"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"Vil du koble til nettverket «<xliff:g id="NETWORK_SSID">%1$s</xliff:g>»?"</string>
-    <!-- no translation found for beam_requires_nfc_enabled (2800366967218600534) -->
-    <skip />
-    <!-- no translation found for beam_requires_beam_enabled (5620935068991096814) -->
-    <skip />
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android Beam krever at NFC er aktivert. Ønsker du å aktivere NFC?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
 </resources>
diff --git a/res/values-ne-rNP/provisioning.xml b/res/values-ne-rNP/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-ne-rNP/provisioning.xml
+++ b/res/values-ne-rNP/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index b2f5505..ebdee3c 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"अवलोकन गर्न छुनुहोस्"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"प्राप्तकर्ताको उपकरणले बिम मार्फत ठूलो फाइल ट्रान्सफर गर्न समर्थन गर्दैन।"</string>
     <string name="beam_try_again" msgid="3364677301009783455">"फेरि उपकरणहरू एकै साथ ल्याउनुहोस्"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"जडान गरिदै"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"जडान गरियो"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"जडान गर्न सकेन।"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"विच्छेद हुँदै..."</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"विच्छेद भएको"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"जोडी हुँदै..."</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"जोडी हुन सकेन"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"बीम अहिले व्यस्त छ। अघिल्लो स्थानान्तरण पूरा भएपछि फेरि प्रयास गर्नुहोस्।"</string>
+    <string name="device" msgid="4459621591392478151">"यन्त्र"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> जडान गर्दै"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"जडित <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> जडान गर्न सकेन"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> विच्छेदन गर्दै"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> विच्छेद गरियो"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> जोडा गर्दै"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> जोडा गर्न सकेन"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"ब्लुटुथ सक्षम पार्न सकेन"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"तपाईँ ब्लुटुथ उपकरण जोडी गर्न निश्चित हुनुहुन्छ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"हो"</string>
@@ -43,5 +45,5 @@
     <string name="title_connect_to_network" msgid="2474034615817280146">"सञ्जालमा जडान गर्नुहोस्"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"सञ्जाल <xliff:g id="NETWORK_SSID">%1$s</xliff:g>मा जडान गर्ने?"</string>
     <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android बीम सक्षम गर्नको लागि NFC आवश्यक छ। के तपाईँ यसलाई सक्षम गर्न चाहनुहुन्छ?"</string>
-    <string name="beam_requires_beam_enabled" msgid="5620935068991096814">"Android बीम सेटिङ्हरूमा सक्षम गरिएको छैन। के तपाईँ यसलाई सक्षम गर्न चाहनुहुन्छ?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android बिम"</string>
 </resources>
diff --git a/res/values-nl/provisioning.xml b/res/values-nl/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-nl/provisioning.xml
+++ b/res/values-nl/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 153de32..11b2c8f 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"Raak aan om te bekijken"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Het apparaat van de ontvanger ondersteunt de overdracht van grote bestanden via beam niet."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Houd de apparaten nogmaals tegen elkaar"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"Verbinding maken"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"Verbonden"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"Kan niet verbinden"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"Loskoppelen"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"Losgekoppeld"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"Koppelen"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"Kan niet koppelen"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Beam is momenteel bezet. Probeer het opnieuw zodra de huidige overdracht is voltooid."</string>
+    <string name="device" msgid="4459621591392478151">"apparaat"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> verbinden"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> verbonden"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"Kan <xliff:g id="DEVICE_NAME">%1$s</xliff:g> niet verbinden"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"Verbinding met <xliff:g id="DEVICE_NAME">%1$s</xliff:g> verbreken"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"Verbinding met <xliff:g id="DEVICE_NAME">%1$s</xliff:g> verbroken"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> koppelen"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"Kan <xliff:g id="DEVICE_NAME">%1$s</xliff:g> niet koppelen"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"Kan Bluetooth niet inschakelen"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"Weet u zeker dat u het Bluetooth-apparaat <xliff:g id="DEVICE_NAME">%1$s</xliff:g> wilt koppelen?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"Ja"</string>
@@ -42,8 +44,6 @@
     <string name="status_wifi_connected" msgid="5893022897732105739">"Verbonden"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"Verbinding maken met netwerk"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"Verbinding maken met netwerk <xliff:g id="NETWORK_SSID">%1$s</xliff:g>?"</string>
-    <!-- no translation found for beam_requires_nfc_enabled (2800366967218600534) -->
-    <skip />
-    <!-- no translation found for beam_requires_beam_enabled (5620935068991096814) -->
-    <skip />
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"NFC moet zijn ingeschakeld voor Android Beam. Wilt u dit inschakelen?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
 </resources>
diff --git a/res/values-pa-rIN/provisioning.xml b/res/values-pa-rIN/provisioning.xml
new file mode 100644
index 0000000..676cad9
--- /dev/null
+++ b/res/values-pa-rIN/provisioning.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2013 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.
+ -->
+
+<!--  NFC resources that may need to be customized
+     for different hardware or product builds.  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="provisioning_mime_types">
+    <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
+  </string-array>
+</resources>
diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa-rIN/strings.xml
new file mode 100644
index 0000000..1a4975e
--- /dev/null
+++ b/res/values-pa-rIN/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="78565911793142902">"Nfc ਸੇਵਾ"</string>
+    <string name="nfcUserLabel" msgid="7708535817084357357">"Nfc"</string>
+    <string name="inbound_me_profile_title" msgid="6146013785225412693">"NFC ਤੇ ਪ੍ਰਾਪਤ ਕੀਤਾ ਸੰਪਰਕ"</string>
+    <string name="inbound_me_profile_text" msgid="2342757196108092923">"ਇਸ ਵਿਅਕਤੀ ਨੂੰ ਇੱਕ ਸੰਪਰਕ ਦੇ ਤੌਰ ਤੇ ਜੋੜਨ ਲਈ ਛੋਹਵੋ।"</string>
+    <string name="outbound_me_profile_title" msgid="2523625031572784769">"NFC ਇੰਟਰੈਕਸ਼ਨ ਪੂਰਾ"</string>
+    <string name="outbound_me_profile_text" msgid="5594998841143667989">"ਇਸ ਵਿਅਕਤੀ ਨੂੰ ਆਪਣੀ ਸੰਪਰਕ ਜਾਣਕਾਰੀ ਦੇਣ ਲਈ ਛੋਹਵੋ।"</string>
+    <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC ਸਮਰਥਿਤ।"</string>
+    <string name="touch" msgid="4727218133711188355">"ਬੀਮ ਕਰਨ ਲਈ ਛੋਹਵੋ"</string>
+    <string name="beam_progress" msgid="7453634884807323920">"ਇਨਕਮਿੰਗ ਬੀਮ..."</string>
+    <string name="beam_outgoing" msgid="4679536649779123495">"ਬੀਮ ਕਰ ਰਿਹਾ ਹੈ..."</string>
+    <string name="beam_complete" msgid="477026736424637435">"ਬੀਮ ਪੂਰਾ"</string>
+    <string name="beam_failed" msgid="5116241718189888630">"ਬੀਮ ਪੂਰਾ ਨਹੀਂ ਕੀਤਾ"</string>
+    <string name="beam_canceled" msgid="5425192751826544741">"ਬੀਮ ਰੱਦ ਕੀਤਾ"</string>
+    <string name="cancel" msgid="61873902552555096">"ਰੱਦ ਕਰੋ"</string>
+    <string name="beam_touch_to_view" msgid="7853129156831642630">"ਦੇਖਣ ਲਈ ਛੋਹਵੋ"</string>
+    <string name="beam_handover_not_supported" msgid="4083165921751489015">"ਰਿਸੀਵਰ ਦੀ ਡਿਵਾਈਸ ਬੀਮ ਰਾਹੀਂ ਵੱਡੀ ਫਾਈਲ ਟ੍ਰਾਂਸਫਰ ਦਾ ਸਮਰਥਨ ਨਹੀਂ ਕਰਦੀ।"</string>
+    <string name="beam_try_again" msgid="3364677301009783455">"ਡਿਵਾਈਸਾਂ ਨੂੰ ਦੁਬਾਰਾ ਇਕੱਠੇ ਨਾਲ ਲਿਆਓ"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"ਬੀਮ ਇਸ ਵੇਲੇ ਰੁੱਝਾ ਹੋਇਆ ਹੈ। ਜਦੋਂ ਪਿਛਲਾ ਟ੍ਰਾਂਸਫਰ ਪੂਰਾ ਹੋ ਜਾਏ ਤਾਂ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
+    <string name="device" msgid="4459621591392478151">"ਡਿਵਾਈਸ"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨੂੰ ਕਨੈਕਟ ਕਰ ਰਿਹਾ ਹੈ"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਕੀਤਾ"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨੂੰ ਕਨੈਕਟ ਨਹੀਂ ਕਰ ਸਕਿਆ"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨੂੰ ਡਿਸਕਨੈਕਟ ਕਰ ਰਿਹਾ ਹੈ"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨੂੰ ਡਿਸਕਨੈਕਟ ਕੀਤਾ"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨੂੰ ਪੇਅਰ ਕਰ ਰਿਹਾ ਹੈ"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨੂੰ ਪੇਅਰ ਨਹੀਂ ਕਰ ਸਕਿਆ"</string>
+    <string name="failed_to_enable_bt" msgid="7229153323594758077">"Bluetooth ਨੂੰ ਸਮਰੱਥ ਨਹੀਂ ਬਣਾ ਸਕਿਆ"</string>
+    <string name="confirm_pairing" msgid="4112568077038265363">"ਕੀ ਤੁਸੀਂ ਯਕੀਨੀ ਤੌਰ ਤੇ Bluetooth ਡਿਵਾਈਸ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨਾਲ ਪੇਅਰ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"</string>
+    <string name="pair_yes" msgid="3525614878559994448">"ਹਾਂ"</string>
+    <string name="pair_no" msgid="5022308368904055020">"ਨਹੀਂ"</string>
+    <string name="tap_again_to_pay" msgid="5754988005412859897">"<xliff:g id="APP">%1$s</xliff:g> ਨਾਲ ਪੇ ਕਰਨ ਲਈ ਦੁਬਾਰਾ ਟੈਪ ਕਰੋ"</string>
+    <string name="tap_again_to_complete" msgid="5423640945118279123">"<xliff:g id="APP">%1$s</xliff:g> ਨਾਲ ਪੂਰਾ ਕਰਨ ਲਈ ਦੁਬਾਰਾ ਟੈਪ ਕਰੋ"</string>
+    <string name="transaction_failure" msgid="7828102078637936513">"ਇਹ ਟ੍ਰਾਂਜੈਕਸ਼ਨ <xliff:g id="APP">%1$s</xliff:g> ਨਾਲ ਪੂਰੀ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ।"</string>
+    <string name="could_not_use_app" msgid="8137587876138569083">"<xliff:g id="APP">%1$s</xliff:g> ਨੂੰ ਨਹੀਂ ਵਰਤ ਸਕਿਆ।"</string>
+    <string name="pay_with" msgid="5531545488795798945">"ਇਸ ਨਾਲ ਪੇ ਕਰੋ"</string>
+    <string name="complete_with" msgid="6797459104103012992">"ਇਸ ਨਾਲ ਪੂਰਾ ਕਰੋ"</string>
+    <string name="default_pay_app_removed" msgid="4108250545457437360">"ਟੈਪ ਕਰੋ &amp; ਪੇ ਕਰੋ ਲਈ ਤੁਹਾਡੀ ਤਰਜੀਹੀ ਸੇਵਾ ਹਟਾ ਦਿੱਤੀ ਗਈ ਸੀ। ਕੀ ਦੂਜੀ ਚੁਣਨੀ ਹੈ?"</string>
+    <string name="ask_nfc_tap" msgid="2925239870458286340">"ਪੂਰਾ ਕਰਨ ਲਈ ਦੂਜੀ ਡਿਵਾਈਸ ਨੂੰ ਟੈਪ ਕਰੋ।"</string>
+    <string name="wifi_connect" msgid="6250727951843550671">"ਕਨੈਕਟ ਕਰੋ"</string>
+    <string name="status_unable_to_connect" msgid="9183908200295307657">"ਨੈਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਕਰਨ ਵਿੱਚ ਅਸਮਰੱਥ"</string>
+    <string name="status_wifi_connected" msgid="5893022897732105739">"ਕਨੈਕਟ ਕੀਤਾ"</string>
+    <string name="title_connect_to_network" msgid="2474034615817280146">"ਨੈਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
+    <string name="prompt_connect_to_network" msgid="8511683573657516114">"ਕੀ <xliff:g id="NETWORK_SSID">%1$s</xliff:g> ਨੈਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਕਰਨਾ ਹੈ?"</string>
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android ਬੀਮ ਲਈ NFC ਨੂੰ ਸਮਰਥਿਤ ਕਰਨ ਦੀ ਲੋੜ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਸਨੂੰ ਸਮਰੱਥ ਬਣਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android ਬੀਮ"</string>
+</resources>
diff --git a/res/values-pl/provisioning.xml b/res/values-pl/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-pl/provisioning.xml
+++ b/res/values-pl/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index f82cd20..28510cb 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"Dotknij, by wyświetlić"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Urządzenie odbierające nie pozwala na zbliżeniowe przesyłanie dużych plików."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Zbliż urządzenia do siebie"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"Łączenie"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"Połączono"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"Nie można nawiązać połączenia"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"Rozłączanie"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"Rozłączone"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"Tworzenie sparowania"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"Nie można sparować"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Funkcja Beam jest teraz zajęta. Spróbuj ponownie, gdy zakończy się poprzednia transmisja."</string>
+    <string name="device" msgid="4459621591392478151">"urządzenie"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"Łączę: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"Połączono: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"Nie udało się połączyć: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"Odłączam: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"Odłączono: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"Paruję: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"Nie udało się sparować: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"Nie można włączyć Bluetootha"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"Czy na pewno chcesz sparować urządzenie Bluetooth <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"Tak"</string>
@@ -42,8 +44,6 @@
     <string name="status_wifi_connected" msgid="5893022897732105739">"Połączono"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"Połącz z siecią"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"Połączyć z siecią <xliff:g id="NETWORK_SSID">%1$s</xliff:g>?"</string>
-    <!-- no translation found for beam_requires_nfc_enabled (2800366967218600534) -->
-    <skip />
-    <!-- no translation found for beam_requires_beam_enabled (5620935068991096814) -->
-    <skip />
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android Beam wymaga włączenia NFC. Włączyć?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
 </resources>
diff --git a/res/values-pt-rPT/provisioning.xml b/res/values-pt-rPT/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-pt-rPT/provisioning.xml
+++ b/res/values-pt-rPT/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 3930c94..0c78c9c 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"Tocar para ver"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"O dispositivo do recetor não suporta a transferência de ficheiros grandes através de partilha."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Juntar os dispositivos novamente"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"A ligar"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"Ligado"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"Não foi possível ligar"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"A desligar"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"Desligado"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"A sincronizar"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"Não foi possível emparelhar"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"O Beam está atualmente ocupado. Tente novamente quando a transferência anterior for concluída."</string>
+    <string name="device" msgid="4459621591392478151">"dispositivo"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"A ligar o <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ligado"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"Não foi possível ligar o <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"A desligar o <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> desligado"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"A sincronizar o <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"Não foi possível sincronizar o <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"Não foi possível ativar o Bluetooth"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"Tem a certeza de que pretende sincronizar o dispositivo Bluetooth <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"Sim"</string>
@@ -42,8 +44,6 @@
     <string name="status_wifi_connected" msgid="5893022897732105739">"Ligado"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"Ligar a uma rede"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"Ligar à rede <xliff:g id="NETWORK_SSID">%1$s</xliff:g>?"</string>
-    <!-- no translation found for beam_requires_nfc_enabled (2800366967218600534) -->
-    <skip />
-    <!-- no translation found for beam_requires_beam_enabled (5620935068991096814) -->
-    <skip />
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"A ativação do Android Beam requer NFC. Pretende ativá-lo?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
 </resources>
diff --git a/res/values-pt/provisioning.xml b/res/values-pt/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-pt/provisioning.xml
+++ b/res/values-pt/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index ea2089e..bbf26d0 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"Toque para visualizar"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"O dispositivo receptor não suporta a transferência de arquivos grandes por meio do Android Beam."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Una dispositivos novamente"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"Conectando"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"Conectado"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"Não foi possível conectar"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"Desconectando"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"Desconectado"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"Pareando"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"Não foi possível parear"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"O Beam está ocupado no momento. Tente novamente quando a transferência anterior for concluída."</string>
+    <string name="device" msgid="4459621591392478151">"dispositivo"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"Conectando <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> conectado"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"Não foi possível conectar o <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"Desconectando <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> desconectado"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"Pareando <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"Não foi possível parear o <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"Não foi possível ativar o Bluetooth"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"Tem certeza de que deseja parear o dispositivo Bluetooth <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"Sim"</string>
@@ -43,5 +45,5 @@
     <string name="title_connect_to_network" msgid="2474034615817280146">"Conectar-se à rede"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"Conectar-se à rede <xliff:g id="NETWORK_SSID">%1$s</xliff:g>?"</string>
     <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"O Android Beam exige que a NFC esteja ativada. Deseja ativá-la?"</string>
-    <string name="beam_requires_beam_enabled" msgid="5620935068991096814">"O Android Beam não está ativado em \"Configurações\". Deseja ativá-lo?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
 </resources>
diff --git a/res/values-ro/provisioning.xml b/res/values-ro/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-ro/provisioning.xml
+++ b/res/values-ro/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 7105d9d..0f7a5d8 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -14,17 +14,19 @@
     <string name="beam_complete" msgid="477026736424637435">"Transmitere încheiată"</string>
     <string name="beam_failed" msgid="5116241718189888630">"Transmiterea nu este finalizată"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"Transmitere anulată"</string>
-    <string name="cancel" msgid="61873902552555096">"Anulaţi"</string>
+    <string name="cancel" msgid="61873902552555096">"Anulați"</string>
     <string name="beam_touch_to_view" msgid="7853129156831642630">"Atingeţi pentru a afişa"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Dispozitivul destinatarului nu acceptă transferul fişierelor mari prin fascicul."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Apropiați dispozitivele din nou"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"Se conectează"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"Conectat"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"Conectarea nu s-a putut realiza."</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"Se deconectează"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"Deconectat"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"Se împerechează"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"Împerecherea a eşuat"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Beam este ocupat. Încercați după finalizarea transferului anterior."</string>
+    <string name="device" msgid="4459621591392478151">"dispozitiv"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"Se conectează <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"S-a conectat <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"Nu s-a putut conecta <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"Se deconectează <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"S-a deconectat <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"Se asociază <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"Nu s-a putut asocia <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"Activarea Bluetooth a eşuat"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"Sigur doriţi să împerecheaţi dispozitivul Bluetooth <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"Da"</string>
@@ -43,5 +45,5 @@
     <string name="title_connect_to_network" msgid="2474034615817280146">"Conectați-vă la rețea"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"Doriți să vă conectați la rețeaua <xliff:g id="NETWORK_SSID">%1$s</xliff:g>?"</string>
     <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android Beam necesită activarea NFC. Activați?"</string>
-    <string name="beam_requires_beam_enabled" msgid="5620935068991096814">"Android Beam nu este activat în Setări. Activați?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Transmitere Android"</string>
 </resources>
diff --git a/res/values-ru/provisioning.xml b/res/values-ru/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-ru/provisioning.xml
+++ b/res/values-ru/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index af3601b..ea338e9 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"Нажмите, чтобы просмотреть"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Устройство получателя не поддерживает передачу больших объемов данных через Android Beam."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Повторить попытку"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"Подключение…"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"Подключено"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"Не удалось подключиться"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"Отключение…"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"Отключено"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"Подключение…"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"Не удалось установить связь"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Передавать данные пока нельзя. Повторите попытку после окончания предыдущего сеанса."</string>
+    <string name="device" msgid="4459621591392478151">"устройство"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"Устройство <xliff:g id="DEVICE_NAME">%1$s</xliff:g> подключается"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"Устройство <xliff:g id="DEVICE_NAME">%1$s</xliff:g> подключено"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"Не удалось подключить устройство <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"Устройство <xliff:g id="DEVICE_NAME">%1$s</xliff:g> отключается"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"Устройство <xliff:g id="DEVICE_NAME">%1$s</xliff:g> отключено"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"Подключение к устройству <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"Не удалось подключить устройство <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"Не удалось включить Bluetooth"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"Подключить Bluetooth-устройство <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"Да"</string>
@@ -35,15 +37,13 @@
     <string name="could_not_use_app" msgid="8137587876138569083">"Невозможно использовать приложение \"<xliff:g id="APP">%1$s</xliff:g>\""</string>
     <string name="pay_with" msgid="5531545488795798945">"Способ оплаты"</string>
     <string name="complete_with" msgid="6797459104103012992">"Использовать"</string>
-    <string name="default_pay_app_removed" msgid="4108250545457437360">"Вы удалили приложение для оплаты через NFC, используемое по умолчанию. Выбрать другое?"</string>
+    <string name="default_pay_app_removed" msgid="4108250545457437360">"Вы удалили приложение для бесконтактной оплаты, используемое по умолчанию. Выбрать другое?"</string>
     <string name="ask_nfc_tap" msgid="2925239870458286340">"Нажмите на экран другого устройства, чтобы передать данные"</string>
     <string name="wifi_connect" msgid="6250727951843550671">"Подключиться"</string>
     <string name="status_unable_to_connect" msgid="9183908200295307657">"Не удалось подключиться к сети"</string>
     <string name="status_wifi_connected" msgid="5893022897732105739">"Соединение установлено"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"Подключение к сети"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"Подключиться к сети <xliff:g id="NETWORK_SSID">%1$s</xliff:g>?"</string>
-    <!-- no translation found for beam_requires_nfc_enabled (2800366967218600534) -->
-    <skip />
-    <!-- no translation found for beam_requires_beam_enabled (5620935068991096814) -->
-    <skip />
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Для работы Android Beam требуется NFC. Включить?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
 </resources>
diff --git a/res/values-si-rLK/provisioning.xml b/res/values-si-rLK/provisioning.xml
index efcee84..55fa3b5 100644
--- a/res/values-si-rLK/provisioning.xml
+++ b/res/values-si-rLK/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning"</item>
   </string-array>
 </resources>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index 3e873e6..611167a 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"බැලීමට ස්පර්ශ කරන්න"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"බීම් ඔස්සේ ලැබෙන්නාගේ උපාංගය විශාල ගොනු හුවමාරුව සඳහා සහය නොදක්වයි."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"නැවතත් උපාංග එකට ගෙනෙන්න"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"සම්බන්ධ වෙමින්"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"සම්බන්ධියි"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"සම්බන්ධ විය නොහැක"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"විසන්ධි වෙමින්"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"විසන්ධි වුණි"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"යුගල කරමින්"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"යුගල කළ නොහැක"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Beam දැනට කාර්ය බහුලය. පෙර මාරුව සම්පූර්ණ වන විට නැවත උත්සාහ කරන්න."</string>
+    <string name="device" msgid="4459621591392478151">"උපාංගය"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> සබැඳෙමින්"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> සබැඳිණි"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> සබැඳීමට නොහැකි විය"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> විසන්ධි කරමින්"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> විසන්ධි කරන ලදී"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> යුගල කරමින්"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> යුගල කිරීමට නොහැකි විය"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"බ්ලූටූත් සබල කළ නොහැක"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> බ්ලූටූත් උපාංගය යුගල කිරීමට අවශ්‍ය බවට ඔබට විශ්වාසද?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"ඔව්"</string>
@@ -43,5 +45,5 @@
     <string name="title_connect_to_network" msgid="2474034615817280146">"ජාලයට සම්බන්ධ කරන්න"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> ජාලයට සම්බන්ධ වන්න ද?"</string>
     <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android Beam වලට NFC සබල කර තිබීමට අවශ්‍යය. ඔබට එය සබල කිරීමට අවශ්‍යයද?"</string>
-    <string name="beam_requires_beam_enabled" msgid="5620935068991096814">"සැකසීම් තුළ Android Beam සබල කරන ලදි. ඔබට එය සබල කිරීමට අවශ්‍යද?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android බීම්"</string>
 </resources>
diff --git a/res/values-sk/provisioning.xml b/res/values-sk/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-sk/provisioning.xml
+++ b/res/values-sk/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index d2b9c85..f87be62 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"Zobrazte dotykom"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Zariadenie príjemcu nepodporuje prenos veľkých súborov prostredníctvom funkcie Beam."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Znova priblížte zariadenia"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"Prebieha pripájanie"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"Pripojené"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"Nepodarilo sa pripojiť"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"Prebieha odpájanie"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"Odpojené"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"Prebieha párovanie"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"Nie je možné spárovať"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Aplikácia Beam je momentálne zaneprázdnená. Skúste to znova, keď sa dokončí predchádzajúci prenos."</string>
+    <string name="device" msgid="4459621591392478151">"zariadenie"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"Pripája sa zariadenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"Zariadenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> je pripojené"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"Zariadenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> sa nepodarilo pripojiť"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"Odpája sa zariadenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"Zariadenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bolo odpojené"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"Páruje sa zariadenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"Zariadenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> sa nepodarilo spárovať"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"Bluetooth sa nepodarilo povoliť"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"Naozaj chcete spárovať zariadenie Bluetooth <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"Áno"</string>
@@ -42,8 +44,6 @@
     <string name="status_wifi_connected" msgid="5893022897732105739">"Pripojené"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"Pripojiť k sieti"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"Pripojiť k sieti <xliff:g id="NETWORK_SSID">%1$s</xliff:g>?"</string>
-    <!-- no translation found for beam_requires_nfc_enabled (2800366967218600534) -->
-    <skip />
-    <!-- no translation found for beam_requires_beam_enabled (5620935068991096814) -->
-    <skip />
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android Beam vyžaduje, aby bola funkcia NFC povolená. Chcete ju aktivovať?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
 </resources>
diff --git a/res/values-sl/provisioning.xml b/res/values-sl/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-sl/provisioning.xml
+++ b/res/values-sl/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 549831f..2fc02a4 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"Dotaknite se za prikaz"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Prejemnikova naprava ne podpira prenosa velikih datotek prek funkcije Android Beam."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Znova združi naprave"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"Vzpostavljanje povezave"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"Povezano"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"Povezava ni mogoča"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"Prekinjanje povezave"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"Ni povezave"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"Seznanjanje"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"Seznanitev ni mogoča"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Android Beam je trenutno zaseden. Poskusite znova, ko se konča prejšnji prenos."</string>
+    <string name="device" msgid="4459621591392478151">"naprava"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"Povezovanje naprave <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"Naprava <xliff:g id="DEVICE_NAME">%1$s</xliff:g> je povezana"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"Naprave <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ni mogoče povezati"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"Prekinjanje povezave z napravo <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"Povezava z napravo <xliff:g id="DEVICE_NAME">%1$s</xliff:g> je prekinjena"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"Seznanjanje naprave <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"Naprave <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ni bilo mogoče seznaniti"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"Bluetootha ni mogoče omogočiti"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"Ste prepričani, da želite seznaniti napravo Bluetooth <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"Da"</string>
@@ -42,8 +44,6 @@
     <string name="status_wifi_connected" msgid="5893022897732105739">"Povezava je vzpostavljena"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"Vzpostavitev povezave z omrežjem"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"Želite vzpostaviti povezavo z omrežjem <xliff:g id="NETWORK_SSID">%1$s</xliff:g>?"</string>
-    <!-- no translation found for beam_requires_nfc_enabled (2800366967218600534) -->
-    <skip />
-    <!-- no translation found for beam_requires_beam_enabled (5620935068991096814) -->
-    <skip />
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Za Android Beam mora biti omogočen NFC. Ali ga želite omogočiti?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
 </resources>
diff --git a/res/values-sq-rAL/provisioning.xml b/res/values-sq-rAL/provisioning.xml
new file mode 100644
index 0000000..676cad9
--- /dev/null
+++ b/res/values-sq-rAL/provisioning.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2013 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.
+ -->
+
+<!--  NFC resources that may need to be customized
+     for different hardware or product builds.  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="provisioning_mime_types">
+    <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
+  </string-array>
+</resources>
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml
new file mode 100644
index 0000000..180714a
--- /dev/null
+++ b/res/values-sq-rAL/strings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="78565911793142902">"Shërbimi NFC"</string>
+    <string name="nfcUserLabel" msgid="7708535817084357357">"NFC"</string>
+    <string name="inbound_me_profile_title" msgid="6146013785225412693">"Kontakti u mor nëpërmjet NFC-së"</string>
+    <string name="inbound_me_profile_text" msgid="2342757196108092923">"Prek për ta shtuar këtë person si kontakt."</string>
+    <string name="outbound_me_profile_title" msgid="2523625031572784769">"Ndërveprimi me NFC-në përfundoi"</string>
+    <string name="outbound_me_profile_text" msgid="5594998841143667989">"Prek për t\'i dhënë këtij personi informacionet e tua të kontaktit."</string>
+    <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC-ja u aktivizua."</string>
+    <string name="touch" msgid="4727218133711188355">"Prek për të dërguar me rreze"</string>
+    <string name="beam_progress" msgid="7453634884807323920">"Dërgimi me rreze është në ardhje..."</string>
+    <string name="beam_outgoing" msgid="4679536649779123495">"Po dërgon me rreze..."</string>
+    <string name="beam_complete" msgid="477026736424637435">"Dërgimi me rreze përfundoi"</string>
+    <string name="beam_failed" msgid="5116241718189888630">"Dërgimi me rreze nuk përfundoi"</string>
+    <string name="beam_canceled" msgid="5425192751826544741">"Dërgimi me rreze u anulua"</string>
+    <string name="cancel" msgid="61873902552555096">"Anulo"</string>
+    <string name="beam_touch_to_view" msgid="7853129156831642630">"Prek për të parë"</string>
+    <string name="beam_handover_not_supported" msgid="4083165921751489015">"Pajisja e marrësit nuk e mbështet transferimin e skedarëve të mëdhenj nëpërmjet dërgimit me rreze."</string>
+    <string name="beam_try_again" msgid="3364677301009783455">"Bashkoji pajisjet përsëri"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Dërgimi me rreze është i zënë aktualisht. Provo përsëri kur të përfundojë transferimi i mëparshëm."</string>
+    <string name="device" msgid="4459621591392478151">"pajisja"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> po lidhet"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> u lidh"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> nuk mund të lidhej"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> po shkëputet"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> u shkëput"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> po çiftohet"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> nuk mund të çiftohej"</string>
+    <string name="failed_to_enable_bt" msgid="7229153323594758077">"Bluetooth-i nuk mund të aktivizohej"</string>
+    <string name="confirm_pairing" msgid="4112568077038265363">"Je i sigurt që dëshiron ta çiftosh pajisjen me bluetooth: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
+    <string name="pair_yes" msgid="3525614878559994448">"Po"</string>
+    <string name="pair_no" msgid="5022308368904055020">"Jo"</string>
+    <string name="tap_again_to_pay" msgid="5754988005412859897">"Trokit përsëri për të paguar me <xliff:g id="APP">%1$s</xliff:g>"</string>
+    <string name="tap_again_to_complete" msgid="5423640945118279123">"Trokit përsëri për të përfunduar me <xliff:g id="APP">%1$s</xliff:g>"</string>
+    <string name="transaction_failure" msgid="7828102078637936513">"Ky transaksion nuk mund të përfundohej me <xliff:g id="APP">%1$s</xliff:g>."</string>
+    <string name="could_not_use_app" msgid="8137587876138569083">"<xliff:g id="APP">%1$s</xliff:g> nuk mund të përdorej."</string>
+    <string name="pay_with" msgid="5531545488795798945">"Paguaj me"</string>
+    <string name="complete_with" msgid="6797459104103012992">"Përfundo me"</string>
+    <string name="default_pay_app_removed" msgid="4108250545457437360">"Shërbimi yt i preferuar për \"trokit dhe paguaj\" u hoq. Të zgjidhet një tjetër?"</string>
+    <string name="ask_nfc_tap" msgid="2925239870458286340">"Trokit te një pajisje tjetër për ta përfunduar"</string>
+    <string name="wifi_connect" msgid="6250727951843550671">"Lidhu"</string>
+    <string name="status_unable_to_connect" msgid="9183908200295307657">"Nuk mund të lidhej me rrjetin"</string>
+    <string name="status_wifi_connected" msgid="5893022897732105739">"U lidh"</string>
+    <string name="title_connect_to_network" msgid="2474034615817280146">"Lidhu me rrjetin"</string>
+    <string name="prompt_connect_to_network" msgid="8511683573657516114">"Të lidhet me rrjetin <xliff:g id="NETWORK_SSID">%1$s</xliff:g>?"</string>
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Dërgimi me rreze i androidit kërkon që NFC-ja të jetë e aktivizuar. Dëshiron që ta aktivizosh?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Dërgimi me rreze i androidit"</string>
+</resources>
diff --git a/res/values-sr/provisioning.xml b/res/values-sr/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-sr/provisioning.xml
+++ b/res/values-sr/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 7efb7e6..d48f5a6 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"Додирните да бисте прегледали"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Уређај пријемника не подржава пренос великих датотека пребацивањем."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Поново приближите уређаје"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"Повезивање"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"Повезано"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"Повезивање није могуће"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"Прекидање везе"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"Веза је прекинута"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"Упаривање"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"Упаривање није могуће"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Пребацивање је тренутно заузето. Покушајте поново када се претходни пренос заврши."</string>
+    <string name="device" msgid="4459621591392478151">"уређај"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"Повезивање са уређајем <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"Уређај <xliff:g id="DEVICE_NAME">%1$s</xliff:g> је повезан"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"Повезивање са уређајем <xliff:g id="DEVICE_NAME">%1$s</xliff:g> није успело"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"Прекидање везе са уређајем <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"Веза са уређајем <xliff:g id="DEVICE_NAME">%1$s</xliff:g> је прекинута"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"Упаривање уређаја <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"Упаривање уређаја <xliff:g id="DEVICE_NAME">%1$s</xliff:g> није успело"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"Није могуће омогућити Bluetooth"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"Да ли сте сигурни да желите да упарите Bluetooth уређај <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"Да"</string>
@@ -42,8 +44,6 @@
     <string name="status_wifi_connected" msgid="5893022897732105739">"Повезана је"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"Повежите се са мрежом"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"Желите ли да се повежете са мрежом <xliff:g id="NETWORK_SSID">%1$s</xliff:g>?"</string>
-    <!-- no translation found for beam_requires_nfc_enabled (2800366967218600534) -->
-    <skip />
-    <!-- no translation found for beam_requires_beam_enabled (5620935068991096814) -->
-    <skip />
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android пребацивање захтева NFC да бисте могли да га омогућите. Желите ли да га омогућите?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android пребацивање"</string>
 </resources>
diff --git a/res/values-sv/provisioning.xml b/res/values-sv/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-sv/provisioning.xml
+++ b/res/values-sv/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index d664323..4545520 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"Tryck och visa"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Mottagarens enheten stöder inte trådlös överföring av stora filer."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"För samman enheterna igen"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"Anslutningen upprättas"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"Anslutningen har upprättats"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"Det gick inte att ansluta"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"Anslutningen avbryts"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"Frånkopplad"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"Parkoppling upprättas"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"Det gick inte att parkoppla"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Beam används för närvarande. Försök igen när den pågående överföringen är klar."</string>
+    <string name="device" msgid="4459621591392478151">"enhet"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"Ansluter <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> har anslutits"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"Det gick inte att ansluta <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"Kopplar från <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> har kopplats från"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"Kopplar <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"Det gick inte att koppla <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"Det gick inte att aktivera Bluetooth"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"Är du säker på att du vill para ihop Bluetooth-enheten <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"Ja"</string>
@@ -42,8 +44,6 @@
     <string name="status_wifi_connected" msgid="5893022897732105739">"Ansluten"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"Anslut till nätverk"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"Vill du ansluta till nätverket <xliff:g id="NETWORK_SSID">%1$s</xliff:g>?"</string>
-    <!-- no translation found for beam_requires_nfc_enabled (2800366967218600534) -->
-    <skip />
-    <!-- no translation found for beam_requires_beam_enabled (5620935068991096814) -->
-    <skip />
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android Beam kräver att NFC har aktiverats. Vill du göra det?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
 </resources>
diff --git a/res/values-sw/provisioning.xml b/res/values-sw/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-sw/provisioning.xml
+++ b/res/values-sw/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 7053fa9..49ddd86 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"Gusa ili utazame"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Kifaa cha upokeaji hakihimili uhamishaji wa faili kubwa kupitia kwenye boriti."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Unganisha vifaa tena"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"Inaunganisha"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"Imeunganishwa"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"Haikuweza kuunganisha"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"Inakata muunganisho"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"Imekata muunganisho"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"Kuoanisha"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"Haikuweza kuoanisha"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Android Beam inatumika kwa sasa. Jaribu tena itakapokamilisha uhamishaji uliotangulia."</string>
+    <string name="device" msgid="4459621591392478151">"kifaa"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"Inaunganisha <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"Imeunganisha <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"Haikuweza kuunganisha <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"Inaondoa <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"Imeondoa <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"Inaoanisha <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"Haikuweza kuoanisha <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"Haikuweza kuwezesha Bluetooth"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"Una uhakika unataka kuoanisha kifaa cha Bluetooth cha <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"Ndiyo"</string>
@@ -42,8 +44,6 @@
     <string name="status_wifi_connected" msgid="5893022897732105739">"Imeunganishwa"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"Unganisha kwenye mtandao"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"Ungependa kuunganisha kwenye mtandao wa <xliff:g id="NETWORK_SSID">%1$s</xliff:g>?"</string>
-    <!-- no translation found for beam_requires_nfc_enabled (2800366967218600534) -->
-    <skip />
-    <!-- no translation found for beam_requires_beam_enabled (5620935068991096814) -->
-    <skip />
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Boriti ya Android inahitaji NFC iwe imewashwa. Je, unataka kuiwasha?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Sambaza kupitia Android"</string>
 </resources>
diff --git a/res/values-ta-rIN/provisioning.xml b/res/values-ta-rIN/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-ta-rIN/provisioning.xml
+++ b/res/values-ta-rIN/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index c4d55b7..62e9bd0 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -18,15 +18,17 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"பார்க்கத் தொடவும்"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"பெறுநரின் சாதனம் பீம் வழியான பெரிய கோப்புப் பரிமாற்றத்தை ஆதரிக்கவில்லை."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"மீண்டும் சாதனங்களை ஒன்றாகக் கொண்டுவரவும்"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"இணைக்கிறது"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"இணைக்கப்பட்டது"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"இணைக்க முடியவில்லை"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"துண்டிக்கிறது"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"தொடர்பு துண்டிக்கப்பட்டது"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"இணைக்கிறது"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"இணைக்க முடியவில்லை"</string>
-    <string name="failed_to_enable_bt" msgid="7229153323594758077">"Bluetooth ஐச் செயல்படுத்த முடியவில்லை"</string>
-    <string name="confirm_pairing" msgid="4112568077038265363">"Bluetooth சாதனம் <xliff:g id="DEVICE_NAME">%1$s</xliff:g> உடன் இணைக்க வேண்டும் என்று விரும்புகிறீர்களா?"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"பீம் தற்போது பணிமிகுதியில் உள்ளது. முந்தைய இடமாற்றம் முடியும்போது, மீண்டும் முயலவும்."</string>
+    <string name="device" msgid="4459621591392478151">"சாதனம்"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>ஐ இணைக்கிறது"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> இணைக்கப்பட்டது"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>ஐ இணைக்க முடியவில்லை"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> துண்டிக்கப்படுகிறது"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> துண்டிக்கப்பட்டது"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> இணைக்கப்படுகிறது"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>ஐ இணைக்க முடியவில்லை"</string>
+    <string name="failed_to_enable_bt" msgid="7229153323594758077">"புளூடூத்தைச் செயல்படுத்த முடியவில்லை"</string>
+    <string name="confirm_pairing" msgid="4112568077038265363">"புளூடூத் சாதனம் <xliff:g id="DEVICE_NAME">%1$s</xliff:g> உடன் இணைக்க வேண்டும் என்று விரும்புகிறீர்களா?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"ஆம்"</string>
     <string name="pair_no" msgid="5022308368904055020">"இல்லை"</string>
     <string name="tap_again_to_pay" msgid="5754988005412859897">"<xliff:g id="APP">%1$s</xliff:g> உடன் கட்டணம் செலுத்த மீண்டும் தட்டவும்"</string>
@@ -35,15 +37,13 @@
     <string name="could_not_use_app" msgid="8137587876138569083">"<xliff:g id="APP">%1$s</xliff:g> ஐப் பயன்படுத்த முடியவில்லை."</string>
     <string name="pay_with" msgid="5531545488795798945">"இதனுடன் செலுத்து"</string>
     <string name="complete_with" msgid="6797459104103012992">"இதனுடன் நிறைவு செய்"</string>
-    <string name="default_pay_app_removed" msgid="4108250545457437360">"தட்டி &amp; கட்டண செலுத்தலுக்கான உங்களின் முன்னுரிமை சேவை அகற்றப்பட்டது. மற்றொன்றைத் தேர்ந்தெடுக்கவா?"</string>
+    <string name="default_pay_app_removed" msgid="4108250545457437360">"தட்டி கட்டண செலுத்தலுக்கான உங்களின் முன்னுரிமை சேவை அகற்றப்பட்டது. மற்றொன்றைத் தேர்ந்தெடுக்கவா?"</string>
     <string name="ask_nfc_tap" msgid="2925239870458286340">"முடிக்க மற்றொரு சாதனத்தைத் தட்டவும்"</string>
     <string name="wifi_connect" msgid="6250727951843550671">"இணை"</string>
     <string name="status_unable_to_connect" msgid="9183908200295307657">"நெட்வொர்க்குடன் இணைக்க முடியவில்லை"</string>
     <string name="status_wifi_connected" msgid="5893022897732105739">"இணைக்கப்பட்டது"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"நெட்வொர்க்குடன் இணை"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> நெட்வொர்க்குடன் இணைக்கவா?"</string>
-    <!-- no translation found for beam_requires_nfc_enabled (2800366967218600534) -->
-    <skip />
-    <!-- no translation found for beam_requires_beam_enabled (5620935068991096814) -->
-    <skip />
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android பீம்மிற்கு NFC இயக்கப்பட்டிருக்க வேண்டும். இயக்கவா?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android பீம்"</string>
 </resources>
diff --git a/res/values-te-rIN/provisioning.xml b/res/values-te-rIN/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-te-rIN/provisioning.xml
+++ b/res/values-te-rIN/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index 11fafde..bf66fd9 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"వీక్షించడానికి తాకండి"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"స్వీకర్త పరికరం Beam ద్వారా పెద్ద ఫైల్ బదిలీకి మద్దతు ఇవ్వదు."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"పరికరాలను మళ్లీ సమీపంలోకి తీసుకురండి"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"కనెక్ట్ చేస్తోంది"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"కనెక్ట్ చేయబడింది"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"కనెక్ట్ చేయడం సాధ్యపడలేదు"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"డిస్‌కనెక్ట్ చేస్తోంది"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"డిస్‌కనెక్ట్ చేయబడింది"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"జత చేస్తోంది"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"జత చేయడం సాధ్యపడలేదు"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Beam ప్రస్తుతం బిజీగా ఉంది. మునుపటి బదిలీ పూర్తయిన తర్వాత మళ్లీ ప్రయత్నించండి."</string>
+    <string name="device" msgid="4459621591392478151">"పరికరం"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>ని కనెక్ట్ చేస్తోంది"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> కనెక్ట్ చేయబడింది"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>ని కనెక్ట్ చేయడం సాధ్యపడలేదు"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>ని డిస్‌కనెక్ట్ చేస్తోంది"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> డిస్‌కనెక్ట్ చేయబడింది"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>ని జత చేస్తోంది"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>ని జత చేయడం సాధ్యపడలేదు"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"బ్లూటూత్‌ను ప్రారంభించడం సాధ్యపడలేదు"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"మీరు ఖచ్చితంగా <xliff:g id="DEVICE_NAME">%1$s</xliff:g> బ్లూటూత్ పరికరాన్ని జత చేయాలనుకుంటున్నారా?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"అవును"</string>
@@ -42,8 +44,6 @@
     <string name="status_wifi_connected" msgid="5893022897732105739">"కనెక్ట్ చేయబడింది"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"నెట్‌‍వర్క్‌కు కనెక్ట్ చేయి"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> నెట్‌వర్క్‌కు కనెక్ట్ చేయాలా?"</string>
-    <!-- no translation found for beam_requires_nfc_enabled (2800366967218600534) -->
-    <skip />
-    <!-- no translation found for beam_requires_beam_enabled (5620935068991096814) -->
-    <skip />
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android Beam కోసం NFC ప్రారంభించబడటం అవసరం. మీరు దాన్ని ప్రారంభించాలనుకుంటున్నారా?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
 </resources>
diff --git a/res/values-th/provisioning.xml b/res/values-th/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-th/provisioning.xml
+++ b/res/values-th/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 2364bec..426a140 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -3,10 +3,10 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"บริการ NFC"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"Nfc"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"ได้รับข้อมูลที่อยู่ติดต่อทาง NFC"</string>
+    <string name="inbound_me_profile_title" msgid="6146013785225412693">"ได้รับข้อมูลรายชื่อติดต่อทาง NFC"</string>
     <string name="inbound_me_profile_text" msgid="2342757196108092923">"แตะเพื่อเพิ่มคนนี้เป็นผู้ติดต่อ"</string>
     <string name="outbound_me_profile_title" msgid="2523625031572784769">"ดำเนินการโต้ตอบกับ NFC ให้เสร็จสมบูรณ์"</string>
-    <string name="outbound_me_profile_text" msgid="5594998841143667989">"แตะเพื่อให้ข้อมูลที่อยู่ติดต่อของคุณแก่คนนี้"</string>
+    <string name="outbound_me_profile_text" msgid="5594998841143667989">"แตะเพื่อให้ข้อมูลรายชื่อติดต่อของคุณแก่คนนี้"</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"เปิดใช้งาน NFC แล้ว"</string>
     <string name="touch" msgid="4727218133711188355">"แตะเพื่อบีม"</string>
     <string name="beam_progress" msgid="7453634884807323920">"บีมขาเข้า..."</string>
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"แตะเพื่อดู"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"อุปกรณ์ของผู้รับไม่สนับสนุนการถ่ายโอนไฟล์ขนาดใหญ่ผ่านการบีม"</string>
     <string name="beam_try_again" msgid="3364677301009783455">"นำอุปกรณ์มารวมกันอีกครั้ง"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"กำลังเชื่อมต่อ"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"เชื่อมต่อแล้ว"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"เชื่อมต่อไม่ได้"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"กำลังเลิกเชื่อมต่อ"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"เลิกเชื่อมต่อแล้ว"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"กำลังจับคู่อุปกรณ์"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"ไม่สามารถจับคู่อุปกรณ์"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Beam ไม่ว่างในขณะนี้ ลองอีกครั้งเมื่อการโอนก่อนหน้าเสร็จสมบูรณ์แล้ว"</string>
+    <string name="device" msgid="4459621591392478151">"อุปกรณ์"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"กำลังเชื่อมต่อกับ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"เชื่อมต่อกับ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> อยู่"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"ไม่สามารถเชื่อมต่อกับ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"กำลังยกเลิกการเชื่อมต่อกับ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"ยกเลิกการเชื่อมต่อกับ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> แล้ว"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"กำลังจับคู่กับ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"ไม่สามารถจับคู่กับ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"ไม่สามารถเปิดใช้งานบลูทูธ"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"คุณแน่ใจหรือไม่ว่าต้องการจับคู่อุปกรณ์บลูทูธ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> นี้"</string>
     <string name="pair_yes" msgid="3525614878559994448">"ใช่"</string>
@@ -35,15 +37,13 @@
     <string name="could_not_use_app" msgid="8137587876138569083">"ไม่สามารถใช้ <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="pay_with" msgid="5531545488795798945">"ชำระเงินด้วย"</string>
     <string name="complete_with" msgid="6797459104103012992">"ดำเนินการให้เสร็จสมบูรณ์ด้วย"</string>
-    <string name="default_pay_app_removed" msgid="4108250545457437360">"บริการที่คุณต้องการสำหรับแตะและจ่ายถูกนำออก เลือกบริการอื่นไหม"</string>
+    <string name="default_pay_app_removed" msgid="4108250545457437360">"บริการที่คุณต้องการสำหรับแตะและจ่ายถูกลบ เลือกบริการอื่นไหม"</string>
     <string name="ask_nfc_tap" msgid="2925239870458286340">"แตะอุปกรณ์อื่นเพื่อทำให้เสร็จสมบูรณ์"</string>
     <string name="wifi_connect" msgid="6250727951843550671">"เชื่อมต่อ"</string>
     <string name="status_unable_to_connect" msgid="9183908200295307657">"ไม่สามารถเชื่อมต่อกับเครือข่าย"</string>
     <string name="status_wifi_connected" msgid="5893022897732105739">"เชื่อมต่อแล้ว"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"เชื่อมต่อกับเครือข่าย"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"เชื่อมต่อกับเครือข่าย <xliff:g id="NETWORK_SSID">%1$s</xliff:g> ไหม"</string>
-    <!-- no translation found for beam_requires_nfc_enabled (2800366967218600534) -->
-    <skip />
-    <!-- no translation found for beam_requires_beam_enabled (5620935068991096814) -->
-    <skip />
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android Beam ต้องการให้เปิดใช้ NFC คุณต้องการเปิดใช้ไหม"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
 </resources>
diff --git a/res/values-tl/provisioning.xml b/res/values-tl/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-tl/provisioning.xml
+++ b/res/values-tl/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 288c572..a37e4b0 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"Pindutin upang tingnan"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Hindi sinusuportahan ng device ng receiver ang malaking paglipat ng file sa pamamagitan ng beam."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Pagsamahing muli ang mga device"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"Kumokonekta"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"Nakakonekta"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"Hindi makakonekta"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"Nagdidiskonekta"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"Nadiskonekta"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"Pinapares"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"Hindi makapagpares"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Kasalukuyang abala ang beam. Subukang muli kapag nakumpleto na ang dating paglilipat."</string>
+    <string name="device" msgid="4459621591392478151">"device"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"Ikinokonekta ang <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"Naikonekta na ang <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"Hindi naikonekta ang <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"Idinidiskonekta ang <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"Nadiskonekta ang <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"Ipinapares ang <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"Hindi naipares ang <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"Hindi mapagana ang Bluetooth"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"Sigurado ka bang nais mong ipares ang Bluetooth device na <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"Oo"</string>
@@ -42,8 +44,6 @@
     <string name="status_wifi_connected" msgid="5893022897732105739">"Nakakonekta"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"Kumonekta sa network"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"Kokonekta sa network na <xliff:g id="NETWORK_SSID">%1$s</xliff:g>?"</string>
-    <!-- no translation found for beam_requires_nfc_enabled (2800366967218600534) -->
-    <skip />
-    <!-- no translation found for beam_requires_beam_enabled (5620935068991096814) -->
-    <skip />
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Kailangang i-enable ang NFC upang magamit ang Android Beam. Gusto mo ba itong i-enable?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
 </resources>
diff --git a/res/values-tr/provisioning.xml b/res/values-tr/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-tr/provisioning.xml
+++ b/res/values-tr/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index c704e00..9ba8a1d 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -18,32 +18,32 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"Görüntülemek için dokunun"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Alıcının cihazı yüksek boyutlu dosyaların ışınlamayla aktarılmasını desteklemiyor."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Cihazları tekrar bir araya getirin"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"Bağlanıyor"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"Bağlandı"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"Bağlantı kurulamadı"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"Bağlantı kesiliyor"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"Bağlantı kesildi"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"Eşleştiriliyor"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"Eşleştirilemedi"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Android Beam şu anda meşgul. Önceki aktarım işlemi tamamlandığında tekrar deneyin."</string>
+    <string name="device" msgid="4459621591392478151">"cihaz"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"Şu cihaza bağlanılıyor: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"Şu cihaza bağlanıldı: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"Şu cihaza bağlanılamadı: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"Şu cihazın bağlantısı kesiliyor: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"Şu cihazın bağlantısı kesildi: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"Şu cihazla eşleştiriliyor: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"Şu cihazla eşleştirilemedi: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"Bluetooth etkinleştirilemedi"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> adlı Bluetooth cihazını eşlemek istediğinizden emin misiniz?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"Evet"</string>
     <string name="pair_no" msgid="5022308368904055020">"Hayır"</string>
     <string name="tap_again_to_pay" msgid="5754988005412859897">"<xliff:g id="APP">%1$s</xliff:g> ile ödemek için tekrar dokundurun"</string>
-    <string name="tap_again_to_complete" msgid="5423640945118279123">"<xliff:g id="APP">%1$s</xliff:g> ile tamamlamak için tekrar hafifçe vurun"</string>
+    <string name="tap_again_to_complete" msgid="5423640945118279123">"<xliff:g id="APP">%1$s</xliff:g> ile tamamlamak için tekrar hafifçe dokunun"</string>
     <string name="transaction_failure" msgid="7828102078637936513">"Bu işlem <xliff:g id="APP">%1$s</xliff:g> ile tamamlanamadı."</string>
     <string name="could_not_use_app" msgid="8137587876138569083">"<xliff:g id="APP">%1$s</xliff:g> kullanılamadı."</string>
     <string name="pay_with" msgid="5531545488795798945">"Ödemeyi şu uygulamayla yap:"</string>
     <string name="complete_with" msgid="6797459104103012992">"İşlemi şu uygulamayla tamamla:"</string>
     <string name="default_pay_app_removed" msgid="4108250545457437360">"Dokundur ve öde özelliği için tercih ettiğiniz hizmet kaldırıldı. Başka bir hizmet seçmek ister misiniz?"</string>
-    <string name="ask_nfc_tap" msgid="2925239870458286340">"Tamamlamak için diğer cihaza hafifçe vurun"</string>
+    <string name="ask_nfc_tap" msgid="2925239870458286340">"Tamamlamak için diğer cihaza hafifçe dokunun"</string>
     <string name="wifi_connect" msgid="6250727951843550671">"Bağlan"</string>
     <string name="status_unable_to_connect" msgid="9183908200295307657">"Ağa bağlanılamıyor"</string>
     <string name="status_wifi_connected" msgid="5893022897732105739">"Bağlanıldı"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"Ağa bağlanın"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> adlı ağa bağlanılsın mı?"</string>
-    <!-- no translation found for beam_requires_nfc_enabled (2800366967218600534) -->
-    <skip />
-    <!-- no translation found for beam_requires_beam_enabled (5620935068991096814) -->
-    <skip />
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android Beam, NFC\'nin etkinleştirilmesini gerektiriyor. Etkinleştirmek istiyor musunuz?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
 </resources>
diff --git a/res/values-uk/provisioning.xml b/res/values-uk/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-uk/provisioning.xml
+++ b/res/values-uk/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 464035b..2c7e0b2 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"Торкніться, щоб переглянути"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Пристрій отримувача не підтримує пересилання великих файлів за допомогою функції Передавання даних Android."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Знову притуліть пристрої один до одного"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"Під’єднання"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"Під’єднано"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"Не вдалося з’єднатись"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"Від’єднання"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"Від’єднано"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"Створення пари"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"Не вдалося створити пару"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Неможливо передати. Повторіть спробу, коли завершиться попереднє передавання."</string>
+    <string name="device" msgid="4459621591392478151">"пристрій"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"Під’єднання пристрою <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"Пристрій <xliff:g id="DEVICE_NAME">%1$s</xliff:g> під’єднано"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"Пристрій <xliff:g id="DEVICE_NAME">%1$s</xliff:g> не під’єднано"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"Від’єднання пристрою <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"Пристрій <xliff:g id="DEVICE_NAME">%1$s</xliff:g> від’єднано"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"Підключення пристрою <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"Пристрій <xliff:g id="DEVICE_NAME">%1$s</xliff:g> не підключено"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"Не вдалося ввімкнути Bluetooth"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"Дійсно створити пару з пристроєм Bluetooth <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"Так"</string>
@@ -42,8 +44,6 @@
     <string name="status_wifi_connected" msgid="5893022897732105739">"Під’єднано"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"Під’єднатися до мережі"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"Під’єднатися до мережі \"<xliff:g id="NETWORK_SSID">%1$s</xliff:g>\"?"</string>
-    <!-- no translation found for beam_requires_nfc_enabled (2800366967218600534) -->
-    <skip />
-    <!-- no translation found for beam_requires_beam_enabled (5620935068991096814) -->
-    <skip />
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Для роботи функції передавання даних Android потрібно ввімкнути NFC. Увімкнути?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Передавання даних Android"</string>
 </resources>
diff --git a/res/values-ur-rPK/provisioning.xml b/res/values-ur-rPK/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-ur-rPK/provisioning.xml
+++ b/res/values-ur-rPK/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index 2c88622..8622bc0 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"دیکھنے کیلئے ٹچ کریں"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"موصول کرنے والے کا آلہ بیم کے ذریعے بڑی فائل کی منتقلی کا تعاون نہیں کرتا ہے۔"</string>
     <string name="beam_try_again" msgid="3364677301009783455">"آلات کو دوبارہ سے ساتھ لائیں"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"مربوط ہو رہا ہے"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"مربوط"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"مربوط نہیں ہو سکا"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"غیر مربوط ہو رہا ہے"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"غیر مربوط"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"جوڑا بنایا جا رہا ہے"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"جوڑا نہیں بنایا جا سکا"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"‏Beam فی الحال مصروف ہے۔ سابقہ منتقلی مکمل ہونے پر دوبارہ کوشش کریں۔"</string>
+    <string name="device" msgid="4459621591392478151">"آلہ"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> منسلک ہو رہا ہے"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> منسلک ہوگیا"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> منسلک نہیں ہو سکا"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> غیر منسلک ہو رہا ہے"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> غیر منسلک ہوگیا"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> جوڑا بنا رہا ہے"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> جوڑا نہیں بنا سکا"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"بلوٹوتھ فعال نہیں ہو سکا"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"کیا آپ واقعی بلوٹوتھ آلہ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> کا جوڑا بنانا چاہتے ہیں؟"</string>
     <string name="pair_yes" msgid="3525614878559994448">"ہاں"</string>
@@ -42,8 +44,6 @@
     <string name="status_wifi_connected" msgid="5893022897732105739">"مربوط"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"نیٹ ورک سے مربوط ہوں"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"نیٹ ورک <xliff:g id="NETWORK_SSID">%1$s</xliff:g> سے مربوط کریں؟"</string>
-    <!-- no translation found for beam_requires_nfc_enabled (2800366967218600534) -->
-    <skip />
-    <!-- no translation found for beam_requires_beam_enabled (5620935068991096814) -->
-    <skip />
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"‏Android Beam کو فعال کیے جانے کیلئے NFC درکار ہے۔ کیا آپ اسے فعال کرنا چاہتے ہیں؟"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
 </resources>
diff --git a/res/values-uz-rUZ/provisioning.xml b/res/values-uz-rUZ/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-uz-rUZ/provisioning.xml
+++ b/res/values-uz-rUZ/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index 0191e27..1c71337 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"Ko‘rish uchun bosing"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Qabul qiluvchining qurilmasi o‘tkazish xususiyati orqali katta hajmdagi fayllar o‘tkazmasini qo‘llab-quvvatlamaydi."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Qurilmalarni yana jipslashtiring"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"Ulanmoqda"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"Ulandi"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"Ulanmadi"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"Uzilmoqda"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"Uzildi"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"Biriktirilmoqda"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"Biriktirilmadi"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Beam hozirda band. Avvalgi o‘tkazma tugallangach, qaytadan urining."</string>
+    <string name="device" msgid="4459621591392478151">"qurilma"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ulanmoqda"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ulandi"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ulanmadi"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> bilan aloqa uzilmoqda"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> bilan aloqa uzildi"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ulanmoqda"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ulanmadi"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"Bluetooth’ni yoqib bo‘lmadi"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> Bluetooth qurilmasini bo‘glashga ishonchingiz komilmi?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"Ha"</string>
@@ -42,8 +44,6 @@
     <string name="status_wifi_connected" msgid="5893022897732105739">"Ulandi"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"Tarmoqqa ulanish"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> tarmog‘iga ulansinmi?"</string>
-    <!-- no translation found for beam_requires_nfc_enabled (2800366967218600534) -->
-    <skip />
-    <!-- no translation found for beam_requires_beam_enabled (5620935068991096814) -->
-    <skip />
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android Beam uchun NFC yoniq bo‘lishi lozim. Uni yoqishni xohlaysizmi?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
 </resources>
diff --git a/res/values-vi/provisioning.xml b/res/values-vi/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-vi/provisioning.xml
+++ b/res/values-vi/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 9af22c9..17cfefd 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"Chạm để xem"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Thiết bị của người nhận không hỗ trợ truyền tệp lớn qua quá trình chiếu."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Nhóm các thiết bị lại với nhau lần nữa"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"Đang kết nối"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"Đã kết nối"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"Không thể kết nối"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"Đang ngắt kết nối"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"Đã ngắt kết nối"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"Đang ghép nối"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"Không thể ghép nối"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Beam hiện đang bận. Hãy thử lại khi quá trình truyền trước đây hoàn tất."</string>
+    <string name="device" msgid="4459621591392478151">"thiết bị"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"Đang kết nối <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"Đã kết nối <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"Không thể kết nối <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"Đang ngắt kết nối <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"Đã ngắt kết nối <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"Đang ghép nối <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"Không thể ghép nối <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"Không thể bật Bluetooth"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"Bạn có chắc chắn muốn ghép nối thiết bị Bluetooth <xliff:g id="DEVICE_NAME">%1$s</xliff:g> không?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"Có"</string>
@@ -42,8 +44,6 @@
     <string name="status_wifi_connected" msgid="5893022897732105739">"Đã kết nối"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"Kết nối mạng"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"Kết nối với mạng <xliff:g id="NETWORK_SSID">%1$s</xliff:g>?"</string>
-    <!-- no translation found for beam_requires_nfc_enabled (2800366967218600534) -->
-    <skip />
-    <!-- no translation found for beam_requires_beam_enabled (5620935068991096814) -->
-    <skip />
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android Beam yêu cầu bật NFC. Bạn có muốn bật NFC không?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
 </resources>
diff --git a/res/values-zh-rCN/provisioning.xml b/res/values-zh-rCN/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-zh-rCN/provisioning.xml
+++ b/res/values-zh-rCN/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 36d04bb..934c1fd 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="78565911793142902">"NFC 服务"</string>
+    <string name="app_name" msgid="78565911793142902">"NFC服务"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"NFC"</string>
-    <string name="inbound_me_profile_title" msgid="6146013785225412693">"已通过 NFC 收到联系人信息"</string>
+    <string name="inbound_me_profile_title" msgid="6146013785225412693">"通过NFC收到了联系人信息"</string>
     <string name="inbound_me_profile_text" msgid="2342757196108092923">"触摸可将此人添加为联系人。"</string>
-    <string name="outbound_me_profile_title" msgid="2523625031572784769">"NFC 互动完成"</string>
+    <string name="outbound_me_profile_title" msgid="2523625031572784769">"NFC互动完成"</string>
     <string name="outbound_me_profile_text" msgid="5594998841143667989">"接触可向此人发送您的联系人信息。"</string>
-    <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC 已启用。"</string>
+    <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC已开启。"</string>
     <string name="touch" msgid="4727218133711188355">"触摸即可传输"</string>
     <string name="beam_progress" msgid="7453634884807323920">"正在接收传输内容..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"正在传输信息..."</string>
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"触摸即可查看"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"接收者的设备不支持传输较大的文件。"</string>
     <string name="beam_try_again" msgid="3364677301009783455">"再次让两台设备接触"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"正在连接"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"已连接"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"无法连接"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"正在断开连接"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"已断开连接"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"正在配对"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"无法配对"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Beam 目前正忙。请在之前的传输任务完成后重试。"</string>
+    <string name="device" msgid="4459621591392478151">"设备"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"正在连接到<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"已连接到<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"无法连接到<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"正在断开与<xliff:g id="DEVICE_NAME">%1$s</xliff:g>的连接"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"已断开与<xliff:g id="DEVICE_NAME">%1$s</xliff:g>的连接"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"正在与<xliff:g id="DEVICE_NAME">%1$s</xliff:g>配对"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"无法与<xliff:g id="DEVICE_NAME">%1$s</xliff:g>配对"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"无法启用蓝牙"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"您确定要与蓝牙设备<xliff:g id="DEVICE_NAME">%1$s</xliff:g>配对吗?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"是"</string>
@@ -42,8 +44,6 @@
     <string name="status_wifi_connected" msgid="5893022897732105739">"已连接"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"连接到网络"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"连接到网络<xliff:g id="NETWORK_SSID">%1$s</xliff:g>?"</string>
-    <!-- no translation found for beam_requires_nfc_enabled (2800366967218600534) -->
-    <skip />
-    <!-- no translation found for beam_requires_beam_enabled (5620935068991096814) -->
-    <skip />
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"需要开启NFC才能使用Android Beam。要开启吗?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
 </resources>
diff --git a/res/values-zh-rHK/provisioning.xml b/res/values-zh-rHK/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-zh-rHK/provisioning.xml
+++ b/res/values-zh-rHK/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 3e326f6..b2d7884 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"輕觸即可查看"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"接收者的裝置不支援經由 Beam 傳送大型檔案。"</string>
     <string name="beam_try_again" msgid="3364677301009783455">"再次把裝置放在一起"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"連線中"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"已連線"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"無法連線"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"正在中斷連線"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"已中斷連線"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"配對中"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"無法配對"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Beam 目前忙碌中。請在完成上一個傳輸工作後再試一次。"</string>
+    <string name="device" msgid="4459621591392478151">"裝置"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"正在連接<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"已連接<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"無法連接<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"正在中斷連接<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"已中斷連接<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"正在配對<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"無法配對<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"無法啟用藍牙"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"您確定要與藍牙裝置「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」配對嗎?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"是"</string>
@@ -42,8 +44,6 @@
     <string name="status_wifi_connected" msgid="5893022897732105739">"已連接"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"連接網絡"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"是否連接網絡「<xliff:g id="NETWORK_SSID">%1$s</xliff:g>」?"</string>
-    <!-- no translation found for beam_requires_nfc_enabled (2800366967218600534) -->
-    <skip />
-    <!-- no translation found for beam_requires_beam_enabled (5620935068991096814) -->
-    <skip />
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"需要 NFC 才能啟用 Android Beam。您要啟用嗎?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
 </resources>
diff --git a/res/values-zh-rTW/provisioning.xml b/res/values-zh-rTW/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-zh-rTW/provisioning.xml
+++ b/res/values-zh-rTW/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index e3fed88..3c33636 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"輕觸即可查看"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"接收者的裝置不支援透過 Beam 傳輸大型檔案。"</string>
     <string name="beam_try_again" msgid="3364677301009783455">"再次將裝置放在一起"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"連線中"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"已連線"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"無法連線"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"正在中斷連線"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"已中斷連線"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"配對中"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"無法配對"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Beam 目前忙碌中。請等待先前的傳輸作業完成,然後再試一次。"</string>
+    <string name="device" msgid="4459621591392478151">"裝置"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"正在與 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 連線"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"已連上 <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"無法與 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 連線"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"正在中斷與 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 的連線"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"已中斷與 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 的連線"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> 配對中"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> 無法配對"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"無法啟用藍牙"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"您確定要與藍牙裝置「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」配對嗎?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"是"</string>
@@ -42,8 +44,6 @@
     <string name="status_wifi_connected" msgid="5893022897732105739">"已連線"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"連線至網路"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"連線至網路 <xliff:g id="NETWORK_SSID">%1$s</xliff:g>?"</string>
-    <!-- no translation found for beam_requires_nfc_enabled (2800366967218600534) -->
-    <skip />
-    <!-- no translation found for beam_requires_beam_enabled (5620935068991096814) -->
-    <skip />
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"需要 NFC 才能啟用 Android Beam。您要啟用嗎?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
 </resources>
diff --git a/res/values-zu/provisioning.xml b/res/values-zu/provisioning.xml
index efcee84..676cad9 100644
--- a/res/values-zu/provisioning.xml
+++ b/res/values-zu/provisioning.xml
@@ -21,5 +21,6 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="provisioning_mime_types">
     <item msgid="3675637130021393293">"application/com.android.managedprovisioning"</item>
+    <item msgid="9182300251635024136">"application/com.android.managedprovisioning.v2"</item>
   </string-array>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 5f8f06d..e69586c 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -18,13 +18,15 @@
     <string name="beam_touch_to_view" msgid="7853129156831642630">"Thinta ukuze ubuke"</string>
     <string name="beam_handover_not_supported" msgid="4083165921751489015">"Idivayisi yomamukeli ayisekeli ukuhanjiswa kwamafayela amakhulu ngokuvumelanisa."</string>
     <string name="beam_try_again" msgid="3364677301009783455">"Phinda uhlanganise ndawonye amadivayisi"</string>
-    <string name="connecting_headset" msgid="3929250919225573008">"Iyaxhuma"</string>
-    <string name="connected_headset" msgid="4047751837023241955">"Ixhunyiwe"</string>
-    <string name="connect_headset_failed" msgid="7500801585498094863">"Ayikwazanga ukuxhuma"</string>
-    <string name="disconnecting_headset" msgid="868262189044372780">"Iyanqamula"</string>
-    <string name="disconnected_headset" msgid="4066109452701733916">"Inqamukile"</string>
-    <string name="pairing_headset" msgid="6443461444755646137">"Iyabhangqa"</string>
-    <string name="pairing_headset_failed" msgid="6509629663883514688">"Ayikwazanga ukumatanisa"</string>
+    <string name="beam_busy" msgid="5253335587620612576">"Ukuvumelansia okwamanje kumatasa. Zama futhi uma ukuthutha kwangaphambili kuqeda."</string>
+    <string name="device" msgid="4459621591392478151">"idivayisi"</string>
+    <string name="connecting_peripheral" msgid="1296182660525660935">"Ixhuma ku-<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connected_peripheral" msgid="20748648543160091">"Ixhunyiwe ku-<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="connect_peripheral_failed" msgid="7925702596242839275">"Ayikwazanga ukuxhuma ku-<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnecting_peripheral" msgid="1443699384809097200">"Iyanqamula ku-<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="disconnected_peripheral" msgid="4470578100296504366">"Inqanyuliwe ku-<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral" msgid="6983626861540899365">"Ibhangqa i-<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="pairing_peripheral_failed" msgid="6087643307743264679">"Ayikwazanga ukubhangqa i-<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="failed_to_enable_bt" msgid="7229153323594758077">"Ayikwazanga ukunika amandla i-Bluetooth"</string>
     <string name="confirm_pairing" msgid="4112568077038265363">"Ingabe unesiqinisekiso sokuthi ufuna ukuhambisa ngakubili idivayisi <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ye-Bluetooth?"</string>
     <string name="pair_yes" msgid="3525614878559994448">"Yebo"</string>
@@ -42,8 +44,6 @@
     <string name="status_wifi_connected" msgid="5893022897732105739">"Ixhunyiwe"</string>
     <string name="title_connect_to_network" msgid="2474034615817280146">"Xhuma kwinethiwekhi"</string>
     <string name="prompt_connect_to_network" msgid="8511683573657516114">"Xhuma kwinethiwekhi ye-<xliff:g id="NETWORK_SSID">%1$s</xliff:g>?"</string>
-    <!-- no translation found for beam_requires_nfc_enabled (2800366967218600534) -->
-    <skip />
-    <!-- no translation found for beam_requires_beam_enabled (5620935068991096814) -->
-    <skip />
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"I-Android Beam idinga ukuthi i-NFC inikwe amandla. Ingabe ufuna ukuyinika amandla?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"I-Android Beam"</string>
 </resources>
diff --git a/res/values/provisioning.xml b/res/values/provisioning.xml
index 8253b09..9823703 100644
--- a/res/values/provisioning.xml
+++ b/res/values/provisioning.xml
@@ -24,5 +24,6 @@
          Mime-types must be lower case, wildcards are *not* accepted. -->
     <string-array name="provisioning_mime_types">
         <item>application/com.android.managedprovisioning</item>
+        <item>application/com.android.managedprovisioning.v2</item>
     </string-array>
 </resources>
diff --git a/src/com/android/nfc/BeamShareActivity.java b/src/com/android/nfc/BeamShareActivity.java
index 10f6632..cff601c 100644
--- a/src/com/android/nfc/BeamShareActivity.java
+++ b/src/com/android/nfc/BeamShareActivity.java
@@ -189,6 +189,7 @@
         }
 
         BeamShareData shareData = null;
+        UserHandle myUserHandle = new UserHandle(UserHandle.myUserId());
         if (mUris.size() > 0) {
             // Uris have our first preference for sharing
             Uri[] uriArray = new Uri[mUris.size()];
@@ -205,18 +206,18 @@
                 }
             }
             if (numValidUris > 0) {
-                shareData = new BeamShareData(null, uriArray, UserHandle.CURRENT, 0);
+                shareData = new BeamShareData(null, uriArray, myUserHandle, 0);
             } else {
                 // No uris left
-                shareData = new BeamShareData(null, null, UserHandle.CURRENT, 0);
+                shareData = new BeamShareData(null, null, myUserHandle, 0);
             }
         } else if (mNdefMessage != null) {
-            shareData = new BeamShareData(mNdefMessage, null, UserHandle.CURRENT, 0);
+            shareData = new BeamShareData(mNdefMessage, null, myUserHandle, 0);
             if (DBG) Log.d(TAG, "Created NDEF message:" + mNdefMessage.toString());
         } else {
             if (DBG) Log.d(TAG, "Could not find any data to parse.");
             // Activity may have set something to share over NFC, so pass on anyway
-            shareData = new BeamShareData(null, null, UserHandle.CURRENT, 0);
+            shareData = new BeamShareData(null, null, myUserHandle, 0);
         }
         mNfcAdapter.invokeBeam(shareData);
         finish();
diff --git a/src/com/android/nfc/P2pEventManager.java b/src/com/android/nfc/P2pEventManager.java
index c68fae8..1f84947 100644
--- a/src/com/android/nfc/P2pEventManager.java
+++ b/src/com/android/nfc/P2pEventManager.java
@@ -68,12 +68,10 @@
 
     @Override
     public void onP2pInRange() {
-        mNfcService.playSound(NfcService.SOUND_START);
         mNdefSent = false;
         mNdefReceived = false;
         mInDebounce = false;
 
-        mVibrator.vibrate(VIBRATION_PATTERN, -1);
         if (mSendUi != null) {
             mSendUi.takeScreenshot();
         }
@@ -102,6 +100,8 @@
 
     @Override
     public void onP2pSendConfirmationRequested() {
+        mNfcService.playSound(NfcService.SOUND_START);
+        mVibrator.vibrate(VIBRATION_PATTERN, -1);
         if (mSendUi != null) {
             mSendUi.showPreSend(false);
         } else {
@@ -197,9 +197,9 @@
 
     @Override
     public void onP2pResumeSend() {
+        mVibrator.vibrate(VIBRATION_PATTERN, -1);
+        mNfcService.playSound(NfcService.SOUND_START);
         if (mInDebounce) {
-            mVibrator.vibrate(VIBRATION_PATTERN, -1);
-            mNfcService.playSound(NfcService.SOUND_START);
             if (mSendUi != null) {
                 mSendUi.showStartSend();
             }
diff --git a/src/com/android/nfc/P2pLinkManager.java b/src/com/android/nfc/P2pLinkManager.java
index c9d0cae..b083549 100755
--- a/src/com/android/nfc/P2pLinkManager.java
+++ b/src/com/android/nfc/P2pLinkManager.java
@@ -164,11 +164,9 @@
     static final int NDEFPUSH_SAP = 0x10;
     static final int HANDOVER_SAP = 0x14;
 
-    static final int LINK_FIRST_PDU_LIMIT_MS = 200;
-    static final int LINK_NOTHING_TO_SEND_DEBOUNCE_MS = 750;
     static final int LINK_SEND_PENDING_DEBOUNCE_MS = 3000;
     static final int LINK_SEND_CONFIRMED_DEBOUNCE_MS = 5000;
-    static final int LINK_SEND_COMPLETE_DEBOUNCE_MS = 250;
+    static final int LINK_SEND_COMPLETE_DEBOUNCE_MS = 500;
     static final int LINK_SEND_CANCELED_DEBOUNCE_MS = 250;
 
     // The amount of time we wait for the link to come up
@@ -188,9 +186,8 @@
 
     // values for mLinkState
     static final int LINK_STATE_DOWN = 1;
-    static final int LINK_STATE_WAITING_PDU = 2;
-    static final int LINK_STATE_UP = 3;
-    static final int LINK_STATE_DEBOUNCE = 4;
+    static final int LINK_STATE_UP = 2;
+    static final int LINK_STATE_DEBOUNCE = 3;
 
     // values for mSendState
     static final int SEND_STATE_NOTHING_TO_SEND = 1;
@@ -242,7 +239,6 @@
     NdefPushClient mNdefPushClient;
     ConnectTask mConnectTask;
     boolean mLlcpServicesConnected;
-    boolean mLlcpConnectDelayed;
     long mLastLlcpActivationTime;
     byte mPeerLlcpVersion;
 
@@ -335,6 +331,9 @@
             if (mForegroundUtils.getForegroundUids().contains(mNdefCallbackUid)) {
                 // Try to get data from the registered NDEF callback
                 prepareMessageToSend(false);
+            } else {
+                mMessageToSend = null;
+                mUrisToSend = null;
             }
             if (mMessageToSend == null && mUrisToSend == null && shareData != null) {
                 // No data from the NDEF callback, get data from ShareData
@@ -365,56 +364,45 @@
                 mEchoServer.onLlcpActivated();
             }
             mLastLlcpActivationTime = SystemClock.elapsedRealtime();
-            mLlcpConnectDelayed = false;
             mPeerLlcpVersion = peerLlcpVersion;
             switch (mLinkState) {
                 case LINK_STATE_DOWN:
                     if (DBG) Log.d(TAG, "onP2pInRange()");
-                    mLinkState = LINK_STATE_WAITING_PDU;
+                    // Start taking a screenshot
                     mEventListener.onP2pInRange();
+                    mLinkState = LINK_STATE_UP;
+                    // If we had a pending send (manual Beam invoke),
+                    // mark it as sending
                     if (mSendState == SEND_STATE_PENDING) {
-                        if (DBG) Log.d(TAG, "Sending pending data.");
-                        mHandler.removeMessages(MSG_WAIT_FOR_LINK_TIMEOUT);
                         mSendState = SEND_STATE_SENDING;
-                        onP2pSendConfirmed(false);
+                        mHandler.removeMessages(MSG_WAIT_FOR_LINK_TIMEOUT);
+                        // Immediately try to connect LLCP services
+                        connectLlcpServices();
                     } else {
                         mSendState = SEND_STATE_NOTHING_TO_SEND;
                         prepareMessageToSend(true);
                         if (mMessageToSend != null ||
                                 (mUrisToSend != null && mHandoverDataParser.isHandoverSupported())) {
-                            // Ideally we would delay showing the Beam animation until
-                            // we know for certain the other side has SNEP/handover.
-                            // Unfortunately, the NXP LLCP implementation has a bug that
-                            // delays the first SYMM for 750ms if it is the initiator.
-                            // This will cause our SNEP connect to be delayed as well,
-                            // and the animation will be delayed for about a second.
-                            // Alternatively, we could have used WKS as a hint to start
-                            // the animation, but we are only correctly setting the WKS
-                            // since Jelly Bean.
+                            // We have data to send, connect LLCP services
+                            connectLlcpServices();
                             if ((mSendFlags & NfcAdapter.FLAG_NDEF_PUSH_NO_CONFIRM) != 0) {
                                 mSendState = SEND_STATE_SENDING;
-                                onP2pSendConfirmed(false);
                             } else {
                                 mSendState = SEND_STATE_NEED_CONFIRMATION;
-                                if (DBG) Log.d(TAG, "onP2pSendConfirmationRequested()");
-                                mEventListener.onP2pSendConfirmationRequested();
                             }
                         }
                     }
                     break;
-                case LINK_STATE_WAITING_PDU:
-                    if (DBG) Log.d(TAG, "Unexpected onLlcpActivated() in LINK_STATE_WAITING_PDU");
-                    return;
                 case LINK_STATE_UP:
                     if (DBG) Log.d(TAG, "Duplicate onLlcpActivated()");
                     return;
                 case LINK_STATE_DEBOUNCE:
-                    if (mSendState == SEND_STATE_SENDING) {
-                        // Immediately connect and try to send again
-                        mLinkState = LINK_STATE_UP;
+                    // Immediately connect and try to send again
+                    mLinkState = LINK_STATE_UP;
+                    if (mSendState == SEND_STATE_SENDING ||
+                            mSendState == SEND_STATE_NEED_CONFIRMATION) {
+                        // If we have something to send still, connect LLCP
                         connectLlcpServices();
-                    } else {
-                        mLinkState = LINK_STATE_WAITING_PDU;
                     }
                     mHandler.removeMessages(MSG_DEBOUNCE_TIMEOUT);
                     break;
@@ -429,25 +417,6 @@
         synchronized (P2pLinkManager.this) {
             long totalTime = SystemClock.elapsedRealtime() - mLastLlcpActivationTime;
             if (DBG) Log.d(TAG, "Took " + Long.toString(totalTime) + " to get first LLCP PDU");
-            switch (mLinkState) {
-                case LINK_STATE_UP:
-                    if (DBG) Log.d(TAG, "Dropping first LLCP packet received");
-                    break;
-                case LINK_STATE_DOWN:
-                case LINK_STATE_DEBOUNCE:
-                   Log.e(TAG, "Unexpected first LLCP packet received");
-                   break;
-                case LINK_STATE_WAITING_PDU:
-                    mLinkState = LINK_STATE_UP;
-                    if (mSendState == SEND_STATE_NOTHING_TO_SEND)
-                        break;
-                    if (totalTime <  LINK_FIRST_PDU_LIMIT_MS || mSendState == SEND_STATE_SENDING) {
-                        connectLlcpServices();
-                    } else {
-                        mLlcpConnectDelayed = true;
-                    }
-                    break;
-            }
         }
     }
 
@@ -477,6 +446,11 @@
                 return;
             }
 
+            if (isBeamDisabled(foregroundUids.get(0))) {
+                if (DBG) Log.d(TAG, "Beam is disabled by policy.");
+                return;
+            }
+
             if (mCallbackNdef != null) {
                 if (foregroundUids.contains(mNdefCallbackUid)) {
                     try {
@@ -501,8 +475,7 @@
             // application disabled this explicitly in their manifest.
             String[] pkgs = mPackageManager.getPackagesForUid(foregroundUids.get(0));
             if (pkgs != null && pkgs.length >= 1) {
-                if (!generatePlayLink || beamDefaultDisabled(pkgs[0])
-                        || isBeamDisabled(foregroundUids.get(0))) {
+                if (!generatePlayLink || beamDefaultDisabled(pkgs[0])) {
                     if (DBG) Log.d(TAG, "Disabling default Beam behavior");
                     mMessageToSend = null;
                     mUrisToSend = null;
@@ -583,7 +556,6 @@
                 case LINK_STATE_DEBOUNCE:
                     Log.i(TAG, "Duplicate onLlcpDectivated()");
                     break;
-                case LINK_STATE_WAITING_PDU:
                 case LINK_STATE_UP:
                     // Debounce
                     mLinkState = LINK_STATE_DEBOUNCE;
@@ -663,13 +635,14 @@
                 return;
             }
             mLlcpServicesConnected = true;
-            if (mSendState == SEND_STATE_SENDING) {
-                // FIXME Keep state to make sure this is only called when in debounce
-                // and remove logic in P2pEventManager to keep track.
+            if (mSendState == SEND_STATE_NEED_CONFIRMATION) {
+                if (DBG) Log.d(TAG, "onP2pSendConfirmationRequested()");
+                mEventListener.onP2pSendConfirmationRequested();
+            } else if (mSendState == SEND_STATE_SENDING) {
                 mEventListener.onP2pResumeSend();
                 sendNdefMessage();
             } else {
-                // User still needs to confirm, or we may have received something already.
+                // Either nothing to send or canceled/complete, ignore
             }
         }
     }
@@ -901,7 +874,7 @@
 
         @Override
         public void onHandoverBusy() {
-            onHandoverBusy();
+            P2pLinkManager.this.onHandoverBusy();
         }
     };
 
@@ -1056,63 +1029,6 @@
         return true;
     }
 
-    int getMessageSize(NdefMessage msg) {
-        if (msg != null) {
-            return msg.toByteArray().length;
-        } else {
-            return 0;
-        }
-    }
-
-    int getMessageTnf(NdefMessage msg) {
-        if (msg == null) {
-            return NdefRecord.TNF_EMPTY;
-        }
-        NdefRecord records[] = msg.getRecords();
-        if (records == null || records.length == 0) {
-            return NdefRecord.TNF_EMPTY;
-        }
-        return records[0].getTnf();
-    }
-
-    String getMessageType(NdefMessage msg) {
-        if (msg == null) {
-            return "null";
-        }
-        NdefRecord records[] = msg.getRecords();
-        if (records == null || records.length == 0) {
-            return "null";
-        }
-        NdefRecord record = records[0];
-        switch (record.getTnf()) {
-            case NdefRecord.TNF_ABSOLUTE_URI:
-                // The actual URI is in the type field, don't log it
-                return "uri";
-            case NdefRecord.TNF_EXTERNAL_TYPE:
-            case NdefRecord.TNF_MIME_MEDIA:
-            case NdefRecord.TNF_WELL_KNOWN:
-                return new String(record.getType(), StandardCharsets.UTF_8);
-            default:
-                return "unknown";
-        }
-    }
-
-    int getMessageAarPresent(NdefMessage msg) {
-        if (msg == null) {
-            return 0;
-        }
-        NdefRecord records[] = msg.getRecords();
-        if (records == null) {
-            return 0;
-        }
-        for (NdefRecord record : records) {
-            if (record.getTnf() == NdefRecord.TNF_EXTERNAL_TYPE &&
-                    Arrays.equals(NdefRecord.RTD_ANDROID_APP, record.getType())) {
-                return 1;
-            }
-        }
-        return 0;
-    }
 
     @Override
     public void onP2pSendConfirmed() {
@@ -1127,18 +1043,10 @@
                 return;
             }
             mSendState = SEND_STATE_SENDING;
-            if (mLinkState == LINK_STATE_WAITING_PDU) {
-                // We could decide to wait for the first PDU here; but
-                // that makes us vulnerable to cases where for some reason
-                // this event is not propagated up by the stack. Instead,
-                // try to connect now.
-                mLinkState = LINK_STATE_UP;
-                connectLlcpServices();
-            } else if (mLinkState == LINK_STATE_UP && mLlcpServicesConnected) {
-                sendNdefMessage();
-            } else if (mLinkState == LINK_STATE_UP && mLlcpConnectDelayed) {
-                // Connect was delayed to interop with pre-MR2 stacks; send connect now.
-                connectLlcpServices();
+            if (mLinkState == LINK_STATE_UP) {
+                if (mLlcpServicesConnected) {
+                    sendNdefMessage();
+                } // else, will send messages when link comes up
             } else if (mLinkState == LINK_STATE_DEBOUNCE) {
                 // Restart debounce timeout and tell user to tap again
                 scheduleTimeoutLocked(MSG_DEBOUNCE_TIMEOUT, LINK_SEND_CONFIRMED_DEBOUNCE_MS);
@@ -1196,8 +1104,6 @@
                 return "LINK_STATE_DEBOUNCE";
             case LINK_STATE_UP:
                 return "LINK_STATE_UP";
-            case LINK_STATE_WAITING_PDU:
-                return "LINK_STATE_WAITING_PDU";
             default:
                 return "<error>";
         }
diff --git a/src/com/android/nfc/beam/BeamManager.java b/src/com/android/nfc/beam/BeamManager.java
index ba16aa5..87ea881 100644
--- a/src/com/android/nfc/beam/BeamManager.java
+++ b/src/com/android/nfc/beam/BeamManager.java
@@ -15,6 +15,7 @@
 */
 package com.android.nfc.beam;
 
+import com.android.nfc.NfcService;
 import com.android.nfc.handover.HandoverDataParser;
 
 import android.bluetooth.BluetoothDevice;
@@ -45,6 +46,8 @@
     private boolean mBeamInProgress;
     private final Handler mCallback;
 
+    private NfcService mNfcService;
+
     private static final class Singleton {
         public static final BeamManager INSTANCE = new BeamManager();
     }
@@ -53,6 +56,7 @@
         mLock = new Object();
         mBeamInProgress = false;
         mCallback = new Handler(Looper.getMainLooper(), this);
+        mNfcService = NfcService.getInstance();
     }
 
     public static BeamManager getInstance() {
@@ -118,6 +122,11 @@
             synchronized (mLock) {
                 mBeamInProgress = false;
             }
+
+            boolean success = msg.arg1 == 1;
+            if (success) {
+                mNfcService.playSound(NfcService.SOUND_END);
+            }
             return true;
         }
         return false;
diff --git a/src/com/android/nfc/beam/BeamReceiveService.java b/src/com/android/nfc/beam/BeamReceiveService.java
index 7deb014..9d24dd0 100644
--- a/src/com/android/nfc/beam/BeamReceiveService.java
+++ b/src/com/android/nfc/beam/BeamReceiveService.java
@@ -1,15 +1,11 @@
 package com.android.nfc.beam;
 
-import com.android.nfc.R;
-
 import android.app.Service;
 import android.bluetooth.BluetoothAdapter;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.media.AudioManager;
-import android.media.SoundPool;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Message;
@@ -33,8 +29,6 @@
     private BeamStatusReceiver mBeamStatusReceiver;
     private boolean mBluetoothEnabledByNfc;
     private int mStartId;
-    private SoundPool mSoundPool;
-    private int mSuccessSound;
     private BeamTransferManager mTransferManager;
     private Messenger mCompleteCallback;
 
@@ -75,7 +69,7 @@
             if (DBG) Log.i(TAG, "Ready for incoming Beam transfer");
             return START_STICKY;
         } else {
-            invokeCompleteCallback();
+            invokeCompleteCallback(false);
             stopSelf(startId);
             return START_NOT_STICKY;
         }
@@ -86,9 +80,6 @@
     public void onCreate() {
         super.onCreate();
 
-        mSoundPool = new SoundPool(1, AudioManager.STREAM_NOTIFICATION, 0);
-        mSuccessSound = mSoundPool.load(this, R.raw.end, 1);
-
         // register BT state receiver
         IntentFilter filter = new IntentFilter(BluetoothAdapter.ACTION_STATE_CHANGED);
         registerReceiver(mBluetoothStateReceiver, filter);
@@ -97,10 +88,6 @@
     @Override
     public void onDestroy() {
         super.onDestroy();
-        if (mSoundPool != null) {
-            mSoundPool.release();
-        }
-
         if (mBeamStatusReceiver != null) {
             unregisterReceiver(mBeamStatusReceiver);
         }
@@ -139,10 +126,12 @@
         return true;
     }
 
-    private void invokeCompleteCallback() {
+    private void invokeCompleteCallback(boolean success) {
         if (mCompleteCallback != null) {
             try {
-                mCompleteCallback.send(Message.obtain(null, BeamManager.MSG_BEAM_COMPLETE));
+                Message msg = Message.obtain(null, BeamManager.MSG_BEAM_COMPLETE);
+                msg.arg1 = success ? 1 : 0;
+                mCompleteCallback.send(msg);
             } catch (RemoteException e) {
                 Log.e(TAG, "failed to invoke Beam complete callback", e);
             }
@@ -152,9 +141,7 @@
     @Override
     public void onTransferComplete(BeamTransferManager transfer, boolean success) {
         // Play success sound
-        if (success) {
-            mSoundPool.play(mSuccessSound, 1.0f, 1.0f, 0, 0, 1.0f);
-        } else {
+        if (!success) {
             if (DBG) Log.d(TAG, "Transfer failed, final state: " +
                     Integer.toString(transfer.mState));
         }
@@ -164,7 +151,7 @@
             mBluetoothAdapter.disable();
         }
 
-        invokeCompleteCallback();
+        invokeCompleteCallback(success);
         stopSelf(mStartId);
     }
 
diff --git a/src/com/android/nfc/beam/BeamSendService.java b/src/com/android/nfc/beam/BeamSendService.java
index 59019d5..6c013ea 100644
--- a/src/com/android/nfc/beam/BeamSendService.java
+++ b/src/com/android/nfc/beam/BeamSendService.java
@@ -16,16 +16,12 @@
 
 package com.android.nfc.beam;
 
-import com.android.nfc.R;
-
 import android.app.Service;
 import android.bluetooth.BluetoothAdapter;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.media.AudioManager;
-import android.media.SoundPool;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Message;
@@ -47,8 +43,6 @@
     private boolean mBluetoothEnabledByNfc;
     private Messenger mCompleteCallback;
     private int mStartId;
-    SoundPool mSoundPool;
-    int mSuccessSound;
 
     private final BluetoothAdapter mBluetoothAdapter;
     private final BroadcastReceiver mBluetoothStateReceiver = new BroadcastReceiver() {
@@ -69,9 +63,6 @@
     public void onCreate() {
         super.onCreate();
 
-        mSoundPool = new SoundPool(1, AudioManager.STREAM_NOTIFICATION, 0);
-        mSuccessSound = mSoundPool.load(this, R.raw.end, 1);
-
         // register BT state receiver
         IntentFilter filter = new IntentFilter(BluetoothAdapter.ACTION_STATE_CHANGED);
         registerReceiver(mBluetoothStateReceiver, filter);
@@ -80,9 +71,6 @@
     @Override
     public void onDestroy() {
         super.onDestroy();
-        if (mSoundPool != null) {
-            mSoundPool.release();
-        }
 
         if (mBeamStatusReceiver != null) {
             unregisterReceiver(mBeamStatusReceiver);
@@ -108,7 +96,7 @@
             if (DBG) Log.i(TAG, "Starting outgoing Beam transfer");
             return START_STICKY;
         } else {
-            invokeCompleteCallback();
+            invokeCompleteCallback(false);
             stopSelf(startId);
             return START_NOT_STICKY;
         }
@@ -170,10 +158,12 @@
         }
     }
 
-    private void invokeCompleteCallback() {
+    private void invokeCompleteCallback(boolean success) {
         if (mCompleteCallback != null) {
             try {
-                mCompleteCallback.send(Message.obtain(null, BeamManager.MSG_BEAM_COMPLETE));
+                Message msg = Message.obtain(null, BeamManager.MSG_BEAM_COMPLETE);
+                msg.arg1 = success ? 1 : 0;
+                mCompleteCallback.send(msg);
             } catch (RemoteException e) {
                 Log.e(TAG, "failed to invoke Beam complete callback", e);
             }
@@ -183,9 +173,7 @@
     @Override
     public void onTransferComplete(BeamTransferManager transfer, boolean success) {
         // Play success sound
-        if (success) {
-            mSoundPool.play(mSuccessSound, 1.0f, 1.0f, 0, 0, 1.0f);
-        } else {
+        if (!success) {
             if (DBG) Log.d(TAG, "Transfer failed, final state: " +
                     Integer.toString(transfer.mState));
         }
@@ -195,7 +183,7 @@
             mBluetoothAdapter.disable();
         }
 
-        invokeCompleteCallback();
+        invokeCompleteCallback(success);
         stopSelf(mStartId);
     }
 
diff --git a/src/com/android/nfc/beam/BluetoothOppHandover.java b/src/com/android/nfc/beam/BluetoothOppHandover.java
index 84d3c20..8e04093 100644
--- a/src/com/android/nfc/beam/BluetoothOppHandover.java
+++ b/src/com/android/nfc/beam/BluetoothOppHandover.java
@@ -118,6 +118,7 @@
             intent.putParcelableArrayListExtra(Intent.EXTRA_STREAM, mUris);
         }
         if (DBG) Log.d(TAG, "Handing off outging transfer to BT");
+        intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
         mContext.sendBroadcast(intent);
 
         complete();
diff --git a/src/com/android/nfc/beam/SendUi.java b/src/com/android/nfc/beam/SendUi.java
index 0761ba5..7eaea08 100644
--- a/src/com/android/nfc/beam/SendUi.java
+++ b/src/com/android/nfc/beam/SendUi.java
@@ -16,7 +16,6 @@
 
 package com.android.nfc.beam;
 
-import com.android.internal.policy.PolicyManager;
 import com.android.nfc.R;
 import com.android.nfc.beam.FireflyRenderer;
 
@@ -46,6 +45,8 @@
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.MotionEvent;
+import com.android.internal.policy.PhoneWindow;
+import android.view.SearchEvent;
 import android.view.Surface;
 import android.view.SurfaceControl;
 import android.view.TextureView;
@@ -296,7 +297,7 @@
         // Create a Window with a Decor view; creating a window allows us to get callbacks
         // on key events (which require a decor view to be dispatched).
         mContext.setTheme(android.R.style.Theme_Black_NoTitleBar_Fullscreen);
-        Window window = PolicyManager.makeNewWindow(mContext);
+        Window window = new PhoneWindow(mContext);
         window.setCallback(this);
         window.requestFeature(Window.FEATURE_NO_TITLE);
         mDecor = window.getDecorView();
@@ -556,6 +557,7 @@
         protected void onPostExecute(Bitmap result) {
             if (mState == STATE_W4_SCREENSHOT) {
                 // Screenshot done, wait for request to start preSend anim
+                mScreenshotBitmap = result;
                 mState = STATE_W4_PRESEND;
             } else if (mState == STATE_W4_SCREENSHOT_THEN_STOP) {
                 // We were asked to finish, move to idle state and exit
@@ -859,6 +861,11 @@
     }
 
     @Override
+    public boolean onSearchRequested(SearchEvent searchEvent) {
+        return onSearchRequested();
+    }
+
+    @Override
     public boolean onSearchRequested() {
         return false;
     }
@@ -869,6 +876,11 @@
         return null;
     }
 
+    public ActionMode onWindowStartingActionMode(
+            android.view.ActionMode.Callback callback, int type) {
+        return null;
+    }
+
     @Override
     public void onActionModeStarted(ActionMode mode) {
     }
diff --git a/src/com/android/nfc/handover/HandoverDataParser.java b/src/com/android/nfc/handover/HandoverDataParser.java
index 71e06ad..691488f 100644
--- a/src/com/android/nfc/handover/HandoverDataParser.java
+++ b/src/com/android/nfc/handover/HandoverDataParser.java
@@ -18,6 +18,8 @@
 
 import java.nio.BufferUnderflowException;
 import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
 import java.nio.charset.Charset;
 import java.util.Arrays;
 import java.util.Random;
@@ -40,11 +42,11 @@
     private static final boolean DBG = false;
 
     private static final byte[] TYPE_BT_OOB = "application/vnd.bluetooth.ep.oob"
-            .getBytes(Charset.forName("US_ASCII"));
+            .getBytes(StandardCharsets.US_ASCII);
     private static final byte[] TYPE_BLE_OOB = "application/vnd.bluetooth.le.oob"
-            .getBytes(Charset.forName("US_ASCII"));
+            .getBytes(StandardCharsets.US_ASCII);
 
-    private static final byte[] TYPE_NOKIA = "nokia.com:bt".getBytes(Charset.forName("US_ASCII"));
+    private static final byte[] TYPE_NOKIA = "nokia.com:bt".getBytes(StandardCharsets.US_ASCII);
 
     private static final byte[] RTD_COLLISION_RESOLUTION = {0x63, 0x72}; // "cr";
 
@@ -348,7 +350,7 @@
             int nameLength = payload.get();
             byte[] nameBytes = new byte[nameLength];
             payload.get(nameBytes);
-            result.name = new String(nameBytes, Charset.forName("UTF-8"));
+            result.name = new String(nameBytes, StandardCharsets.UTF_8);
         } catch (IllegalArgumentException e) {
             Log.i(TAG, "nokia: invalid BT address");
         } catch (BufferUnderflowException e) {
@@ -376,13 +378,13 @@
                     case BT_HANDOVER_TYPE_SHORT_LOCAL_NAME:
                         nameBytes = new byte[len - 1];
                         payload.get(nameBytes);
-                        result.name = new String(nameBytes, Charset.forName("UTF-8"));
+                        result.name = new String(nameBytes, StandardCharsets.UTF_8);
                         break;
                     case BT_HANDOVER_TYPE_LONG_LOCAL_NAME:
                         if (result.name != null) break;  // prefer short name
                         nameBytes = new byte[len - 1];
                         payload.get(nameBytes);
-                        result.name = new String(nameBytes, Charset.forName("UTF-8"));
+                        result.name = new String(nameBytes, StandardCharsets.UTF_8);
                         break;
                     default:
                         payload.position(payload.position() + len - 1);
@@ -427,7 +429,7 @@
                     case BT_HANDOVER_TYPE_LONG_LOCAL_NAME:
                         nameBytes = new byte[len - 1];
                         payload.get(nameBytes);
-                        result.name = new String(nameBytes, Charset.forName("UTF-8"));
+                        result.name = new String(nameBytes, StandardCharsets.UTF_8);
                         break;
                     default:
                         payload.position(payload.position() + len - 1);
diff --git a/tests/Android.mk b/tests/Android.mk
index be8dff1..ae91373 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -26,6 +26,6 @@
 LOCAL_PACKAGE_NAME := NfcTests
 LOCAL_CERTIFICATE := platform
 
-LOCAL_INSTRUMENTATION_FOR := Nfc
+LOCAL_INSTRUMENTATION_FOR := NfcNci
 
 include $(BUILD_PACKAGE)