diff --git a/Android.bp b/Android.bp
index 04b4a53..b1f9e86 100644
--- a/Android.bp
+++ b/Android.bp
@@ -8,7 +8,7 @@
     platform_apis: true,
     certificate: "platform",
     jni_libs: ["libnfc_nci_jni"],
-    static_libs: ["android-support-v4"],
+    static_libs: ["androidx.legacy_legacy-support-v4"],
     optimize: {
         enabled: false,
     },
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8821fac..2649328 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -58,6 +58,7 @@
     <uses-permission android:name="android.permission.USER_ACTIVITY" />
     <uses-permission android:name="android.permission.BIND_RESOLVER_RANKER_SERVICE" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+    <uses-permission android:name="android.permission.START_ACTIVITIES_FROM_BACKGROUND" />
     <uses-permission android:name="android.permission.NETWORK_SETTINGS" />
 
     <application android:name=".NfcApplication"
@@ -75,7 +76,7 @@
         <meta-data android:name="com.google.android.backup.api_key"
             android:value="AEdPqrEAAAAIbiKKs0wlimxeJ9y8iRIaBOH6aeb2IurmZyBHvg" />
 
-        <provider android:name="android.support.v4.content.FileProvider"
+        <provider android:name="androidx.core.content.FileProvider"
             android:authorities="com.google.android.nfc.fileprovider"
             android:grantUriPermissions="true"
             android:exported="false">
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 948d07c..bb1391b 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"Jou tablet het \'n skakel deur NFC ontvang:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"Jou foon het \'n skakel deur NFC ontvang:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"Maak skakel oop"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"NFC-leesfout. Probeer weer."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"Geen gesteunde program vir hierdie NFC-merker nie"</string>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index fc08776..b6010ac 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"የእርስዎ ጡባዊ በNFC በኩል አገናኝ ተቀብሏል፦"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"የእርስዎ ስልክ በNFC በኩል አገናኝ ተቀብሏል፦"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"አገናኝ ክፈት"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"የNFC ማንበብ ስህተት። እንደገና ይሞክሩ።"</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"ለዚህ የNFC መለያ የሚደገፍ መተግበሪያ የለም"</string>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index ab3e244..66e875c 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -3,7 +3,7 @@
     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="accessibility_nfc_enabled" msgid="7796246979948787735">"‏تم تمكين NFC."</string>
+    <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"‏تم تفعيل NFC."</string>
     <string name="tap_to_beam" msgid="5819197866281059878">"Tap to beam"</string>
     <string name="beam_progress" msgid="7453634884807323920">"بيانات واردة..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"إرسال لاسلكي..."</string>
@@ -23,7 +23,7 @@
     <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="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>
@@ -40,11 +40,13 @@
     <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_nfc_enabled" msgid="2800366967218600534">"‏يتطلب شعاع Android تفعيل ميزة NFC. هل تريد تفعيلها؟"</string>
     <string name="android_beam" msgid="1666446406999492763">"‏شعاع Android"</string>
-    <string name="beam_requires_external_storage_permission" msgid="8798337545702206901">"لا يحتوي التطبيق على إذن سعة تخزين خارجية، إلا أنه مطلوب لإرسال هذا الملف"</string>
+    <string name="beam_requires_external_storage_permission" msgid="8798337545702206901">"لا يحتوي التطبيق على إذن مساحة تخزين خارجية، إلا أنه مطلوب لإرسال هذا الملف"</string>
     <string name="title_confirm_url_open" msgid="8069968913244794478">"هل تريد فتح الرابط؟"</string>
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"‏تلقى جهازك اللوحي رابطًا عبر ميزة NFC:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"‏تلقى هاتفك رابطًا عبر ميزة NFC:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"فتح الرابط"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"‏حدث خطأ أثناء قراءة علامة NFC. يُرجى إعادة المحاولة."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"‏ليس هناك تطبيق متوافق مع علامة NFC هذه."</string>
 </resources>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
new file mode 100644
index 0000000..a07eef0
--- /dev/null
+++ b/res/values-as/strings.xml
@@ -0,0 +1,52 @@
+<?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="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC সক্ষম কৰা হ\'ল৷"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"বীম কৰিবলৈ টিপক"</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_tap_to_view" msgid="7430394753262448349">"চাবলৈ টিপক"</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">"ব্লুটুথ সক্ষম কৰিব পৰা নগ\'ল"</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_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>
+    <string name="beam_requires_external_storage_permission" msgid="8798337545702206901">"এপ্লিকেশ্বনটোৰ বাহ্যিক সঞ্চয়াগাৰ ব্যৱহাৰ কৰাৰ অনুমতি নাই৷ এই ফাইলটো বীম কৰিবলৈ এয়া প্ৰয়োজন।"</string>
+    <string name="title_confirm_url_open" msgid="8069968913244794478">"লিংক খুলিবনে?"</string>
+    <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"আপোনাৰ টেবলেটে NFC যোগে এই লিংক পাইছে:"</string>
+    <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"আপোনাৰ ফ\'নে NFC যোগে এই লিংক পাইছে:"</string>
+    <string name="action_confirm_url_open" msgid="3458322738812921189">"লিংক খোলক"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"NFC পঢ়া আসোঁৱাহ। আকৌ চেষ্টা কৰক।"</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"এই NFC টেগৰ বাবে কোনো সমৰ্থিত এপ্লিকেশ্বন নাই"</string>
+</resources>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index fbe6683..b45fd17 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"Planşet NFC ilə link əldə etdi:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"Telefon NFC ilə link əldə etdi:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"Linki açın"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"NFC oxuma xətası. Yenidən cəhd edin."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"NFC Teq üçün dəstəklənən tətbiq yoxdur"</string>
 </resources>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 91c1402..5c1d60c 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"Tablet je primio link preko NFC-a:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"Telefon je primio link preko NFC-a:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"Otvori link"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"Došlo je do greške u čitanju NFC oznake. Probajte ponovo."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"Nijedna aplikacija ne podržava ovu NFC oznaku"</string>
 </resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 91e20ce..88cf49e 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"На планшэт праз NFC прыйшла спасылка:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"На тэлефон праз NFC прыйшла спасылка:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"Адкрыць спасылку"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"Памылка чытання NFC. Паўтарыце спробу."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"Няма праграм, якія падтрымліваюцца для гэтага цэтліка NFC"</string>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 2fa13e3..cc29d6c 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"Таблетът ви получи връзка през КБП:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"Телефонът ви получи връзка през КБП:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"Отваряне на връзката"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"Грешка при четенето на маркера за КБП. Опитайте отново."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"Няма приложение, което поддържа този маркер за КБП"</string>
 </resources>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 0c4c8ca..3e37644 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"আপনার ট্যাবলেট NFC এর মাধ্যমে একটি লিঙ্ক পেয়েছে:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"আপনার ফোন NFC এর মাধ্যমে একটি লিঙ্ক পেয়েছে:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"লিঙ্ক খুলুন"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"NFC পড়তে সমস্যা হয়েছে। আবার চেষ্টা করুন।"</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"এই NFC ট্যাগ ব্যবহার করার মতো কোনও অ্যাপ্লিকেশন নেই"</string>
 </resources>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 99b9329..4fa3c8d 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"Vaš tablet je primio link preko NFC-a:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"Vaš telefon je primio link preko NFC-a:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"Otvori link"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"Greška prilikom očitavanja NFC-a. Pokušajte ponovo."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"Nema podržane aplikacije za ovu NFC oznaku"</string>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index deb798d..549a441 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"Has rebut un enllaç a la tauleta per NFC:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"Has rebut un enllaç al telèfon per NFC:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"Obre l\'enllaç"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"Hi ha hagut un error en llegir l\'etiqueta NFC. Torna-ho a provar."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"No hi ha cap aplicació compatible amb aquesta etiqueta NFC"</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 9339ceb..62b254d 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"Tablet obdržel odkaz přes NFC:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"Telefon obdržel odkaz přes NFC:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"Otevřít odkaz"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"Při čtení NFC došlo k chybě. Zkuste to znovu."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"Pro tuto značku NFC není k dispozici žádná podporovaná aplikace"</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index ca327f2..ac8bf24 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"Du har modtaget et link på din tablet via NFC:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"Du har modtaget et link på din telefon via NFC:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"Åbn link"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"NFC-læsefejl. Prøv igen."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"Der er ingen understøttede apps til dette NFC-tag"</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 865c191..8dc769c 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -25,7 +25,7 @@
     <string name="pairing_peripheral_failed" msgid="6087643307743264679">"Koppeln 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öchtest du das Bluetooth-Gerät <xliff:g id="DEVICE_NAME">%1$s</xliff:g> wirklich koppeln?"</string>
-    <string name="pair_yes" msgid="3525614878559994448">"Ja"</string>
+    <string name="pair_yes" msgid="3525614878559994448">"\"Ja\""</string>
     <string name="pair_no" msgid="5022308368904055020">"Nein"</string>
     <string name="tap_again_to_pay" msgid="5754988005412859897">"Halte dein Gerät erneut ans Terminal, um mit <xliff:g id="APP">%1$s</xliff:g> zu bezahlen."</string>
     <string name="tap_again_to_complete" msgid="5423640945118279123">"Halte dein Gerät erneut ans Terminal, um den Vorgang mit <xliff:g id="APP">%1$s</xliff:g> durchzuführen."</string>
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"Du hast auf dem Tablet via NFC einen Link erhalten:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"Du hast auf dem Smartphone via NFC einen Link erhalten:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"Link öffnen"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"NFC-Lesefehler. Bitte versuch es noch einmal."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"Keine unterstützte Anwendung für dieses NFC-Tag"</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 377e1a4..ccdc0dd 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"Το tablet έλαβε έναν σύνδεσμο μέσω NFC:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"Το τηλέφωνό σας έλαβε έναν σύνδεσμο μέσω NFC:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"Άνοιγμα συνδέσμου"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"Σφάλμα ανάγνωσης NFC. Δοκιμάστε ξανά."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"Δεν υπάρχει υποστηριζόμενη εφαρμογή για αυτήν την ετικέτα NFC"</string>
 </resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 77b59f5..7ee2efe 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"Your tablet received a link through NFC:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"Your phone received a link through NFC:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"Open link"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"NFC read error. Try again."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"No supported application for this NFC Tag"</string>
 </resources>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 77b59f5..7ee2efe 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"Your tablet received a link through NFC:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"Your phone received a link through NFC:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"Open link"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"NFC read error. Try again."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"No supported application for this NFC Tag"</string>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 77b59f5..7ee2efe 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"Your tablet received a link through NFC:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"Your phone received a link through NFC:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"Open link"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"NFC read error. Try again."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"No supported application for this NFC Tag"</string>
 </resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 77b59f5..7ee2efe 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"Your tablet received a link through NFC:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"Your phone received a link through NFC:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"Open link"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"NFC read error. Try again."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"No supported application for this NFC Tag"</string>
 </resources>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index b81dfa3..95a1f12 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‎‎‏‎‏‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‎‎‎‏‎‏‎‎‎‎‎‏‎‎‎‏‏‏‏‏‎‏‏‏‏‏‏‎‎‏‎‏‏‏‎‏‏‎‏‎‎‎‏‎‎‏‎‎‎‏‏‎‏‏‏‎Your tablet received a link through NFC:‎‏‎‎‏‎"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‎‎‏‎‏‏‎‏‏‏‏‎‏‏‎‎‎‏‎‏‎‎‏‏‎‎‎‎‎‏‏‎‎‎‏‏‎‎‎‎‎‎‏‎‎‎‏‏‏‏‏‎‎‏‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‎Your phone received a link through NFC:‎‏‎‎‏‎"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‎‎‏‎‏‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‏‏‏‎‎‎‏‏‎‏‎‏‎‎‏‏‏‏‎‏‏‎‎‏‏‎‎‏‏‎‏‎‎‏‎‏‎‏‏‎‎‏‎‏‎Open link‎‏‎‎‏‎"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‎‎‏‎‏‏‎‏‏‏‏‏‎‏‎‎‎‏‎‎‏‏‏‏‏‎‏‎‏‏‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‏‏‎‏‏‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‏‏‎NFC read error. Try again.‎‏‎‎‏‎"</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‎‎‏‎‏‏‎‏‏‏‏‏‎‏‏‎‎‎‏‎‏‏‏‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‎‎‏‏‎‏‏‏‎‎‏‏‏‏‏‏‏‎‎‏‎‎‏‎‎‎‎‏‎‏‎‎‎‎‎‎No supported application for this NFC Tag‎‏‎‎‏‎"</string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 656b359..c5d70b4 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"Tu tablet recibió un vínculo mediante NFC:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"Tu teléfono recibió un vínculo mediante NFC:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"Abrir vínculo"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"Error de lectura de NFC. Vuelve a intentarlo."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"No hay apps compatibles con esta etiqueta NFC"</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 15b1ab7..f563e5d 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"Has recibido un enlace en tu tablet por NFC:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"Has recibido un enlace en tu teléfono por NFC:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"Abrir enlace"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"Se ha producido un error de lectura de NFC. Inténtalo de nuevo."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"No hay ninguna aplicación compatible con esta etiqueta NFC"</string>
 </resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index cab3196..a2442d0 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"Teie tahvelarvuti sai lingi NFC kaudu:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"Teie telefon sai lingi NFC kaudu:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"Ava link"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"NFC-kiibi lugemise viga. Proovige uuesti."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"Selle NFC-kiibi puhul toetatud rakendus puudub"</string>
 </resources>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 6c10cec..aa0c259 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"Esteka bat jaso duzu tabletan NFC bidez:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"Esteka bat jaso duzu telefonoan NFC bidez:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"Ireki esteka"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"Errore bat gertatu da NFC etiketa irakurtzean. Saiatu berriro."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"Ez dago NFC etiketa hau onartzen duen aplikaziorik"</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index a56a293..32c3729 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"‏رایانه لوحی‌تان پیوندی ازطریق NFC دریافت کرد:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"‏تلفنتان پیوندی ازطریق NFC دریافت کرد:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"باز کردن پیوند"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"‏خطای خواندن NFC. دوباره امتحان کنید."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"‏برنامه پشتیبانی‌شده‌ای برای نشان NFC وجود ندارد"</string>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index b747c10..99750da 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"Tablettisi vastaanotti linkin NFC:n kautta:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"Puhelimesi vastaanotti linkin NFC:n kautta:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"Avaa linkki"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"NFC-lukuvirhe. Yritä uudelleen."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"Ei NFC-tagia tukevia sovelluksia"</string>
 </resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 096d3f0..6833808 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"Votre tablette a reçu un lien par NFC :"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"Votre téléphone a reçu un lien par NFC :"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"Ouvrir le lien"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"Erreur de lecture NFC. Réessayez."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"Aucune application prise en charge pour cette balise NFC"</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 42e499e..a61a322 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"Votre tablette a reçu un lien via NFC :"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"Votre téléphone a reçu un lien via NFC :"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"Ouvrir le lien"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"Erreur de lecture NFC. Veuillez réessayer."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"Aucune application compatible avec ce tag NFC"</string>
 </resources>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index f69fbd3..d5bcabe 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"A túa tableta recibiu unha ligazón mediante NFC:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"O teu teléfono recibiu unha ligazón mediante NFC:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"Abrir ligazón"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"Produciuse un erro de lectura da etiqueta NFC. Téntao de novo."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"Non hai ningunha aplicación compatible para esta etiqueta NFC"</string>
 </resources>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 7f6f9d4..c9c83dc 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"તમારા ટૅબ્લેટને NFC મારફતે એક લિંક પ્રાપ્ત થઈ છે:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"તમારા ફોનને NFC મારફતે એક લિંક પ્રાપ્ત થઈ છે:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"લિંક ખોલો"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"NFC વાંચનમાં ભૂલ. ફરી પ્રયાસ કરો."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"આ NFC ટૅગ માટે કોઈ સહાયક ઍપ્લિકેશન નથી"</string>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index e33da37..2260a82 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"आपके टैबलेट पर NFC के ज़रिए एक लिंक आया है:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"आपके फ़ोन पर NFC के ज़रिए एक लिंक आया है:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"लिंक को खोलें"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"एनएफ़सी की जानकारी नहीं पता की जा सकी. कृपया फिर से कोशिश करें."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"ऐसा कोई ऐप्लिकेशन मौजूद नहीं है, जिससे यह एनएफ़सी टैग इस्तेमाल किया जा सके"</string>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index ce7486d..9944667 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"Vaš je tablet primio vezu NFC-om:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"Vaš je telefon primio vezu NFC-om:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"Otvori vezu"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"Pogreška pri čitanju NFC-a. Pokušajte ponovo."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"Nema podržane aplikacije za ovu oznaku NFC"</string>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 60a3f39..0b73bce 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"Táblagépe linket kapott NFC-n keresztül:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"Telefonja linket kapott NFC-n keresztül:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"Link megnyitása"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"NFC-olvasási hiba. Próbálja újra."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"Nem található támogatott alkalmazás ehhez az NFC-címkéhez"</string>
 </resources>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index d3857c0..da711d1 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -24,7 +24,7 @@
     <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="confirm_pairing" msgid="4112568077038265363">"Իսկապե՞ս ուզում եք զուգավորել <xliff:g id="DEVICE_NAME">%1$s</xliff:g> Bluetooth սարքը:"</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>
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"Ձեր պլանշետին ուղարկվել է հղում NFC-ի միջոցով:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"Ձեր հեռախոսին ուղարկվել է հղում NFC-ի միջոցով:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"Բացել հղումը"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"Չհաջողվեց կարդալ NFC պիտակը։ Նորից փորձեք:"</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"Այս NFC պիտակի համար աջակցվող հավելված չկա"</string>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index bccc3b3..aec5dec 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -11,7 +11,7 @@
     <string name="beam_failed" msgid="5116241718189888630">"Beam tidak lengkap"</string>
     <string name="beam_canceled" msgid="5425192751826544741">"Beam dibatalkan"</string>
     <string name="cancel" msgid="61873902552555096">"Batal"</string>
-    <string name="beam_tap_to_view" msgid="7430394753262448349">"Ketuk untuk melihat"</string>
+    <string name="beam_tap_to_view" msgid="7430394753262448349">"Tap 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="beam_busy" msgid="5253335587620612576">"Beam sedang sibuk. Coba lagi jika transfer sebelumnya telah selesai."</string>
@@ -27,14 +27,14 @@
     <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>
     <string name="pair_no" msgid="5022308368904055020">"Tidak"</string>
-    <string name="tap_again_to_pay" msgid="5754988005412859897">"Ketuk lagi untuk membayar dengan <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <string name="tap_again_to_complete" msgid="5423640945118279123">"Ketuk lagi untuk menyelesaikan dengan <xliff:g id="APP">%1$s</xliff:g>"</string>
+    <string name="tap_again_to_pay" msgid="5754988005412859897">"Tap lagi untuk membayar dengan <xliff:g id="APP">%1$s</xliff:g>"</string>
+    <string name="tap_again_to_complete" msgid="5423640945118279123">"Tap lagi untuk menyelesaikan dengan <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="transaction_failure" msgid="7828102078637936513">"Transaksi ini tidak dapat diselesaikan dengan <xliff:g id="APP">%1$s</xliff:g>."</string>
     <string name="could_not_use_app" msgid="8137587876138569083">"Tidak dapat menggunakan <xliff:g id="APP">%1$s</xliff:g>."</string>
     <string name="pay_with" msgid="5531545488795798945">"Bayar dengan"</string>
     <string name="complete_with" msgid="6797459104103012992">"Selesaikan dengan"</string>
-    <string name="default_pay_app_removed" msgid="4108250545457437360">"Layanan pilihan Anda untuk ketuk &amp; bayar telah dihapus. Pilih yang lain?"</string>
-    <string name="ask_nfc_tap" msgid="2925239870458286340">"Ketuk perangkat lain untuk menyelesaikan"</string>
+    <string name="default_pay_app_removed" msgid="4108250545457437360">"Layanan pilihan Anda untuk tap &amp; bayar telah dihapus. Pilih yang lain?"</string>
+    <string name="ask_nfc_tap" msgid="2925239870458286340">"Tap perangkat lain untuk menyelesaikan"</string>
     <string name="wifi_connect" msgid="6250727951843550671">"Sambungkan"</string>
     <string name="status_unable_to_connect" msgid="9183908200295307657">"Tidak dapat menyambung ke jaringan"</string>
     <string name="status_wifi_connected" msgid="5893022897732105739">"Tersambung"</string>
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"Tablet Anda menerima link melalui NFC:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"Ponsel Anda menerima link melalui NFC:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"Buka link"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"Pembacaan NFC error. Coba lagi."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"Aplikasi tidak didukung untuk Tag NFC ini"</string>
 </resources>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 2433db3..e00fba7 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"Spjaldtölvan þín fékk tengil um NFC:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"Síminn þinn fékk tengil um NFC:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"Opna tengil"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"Villa í lestri NFC-merkis. Reyndu aftur."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"Ekkert stutt forrit fyrir þetta NFC-merki"</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 365a1d4..b1730e2 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"Hai ricevuto un link tramite NFC sul tablet:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"Hai ricevuto un link tramite NFC sul telefono:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"Apri il link"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"Errore durante la lettura del tag NFC. Riprova."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"Nessuna app supportata per questo tag NFC"</string>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index f879191..244841f 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"‏הטאבלט קיבל קישור דרך NFC:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"‏הטלפון קיבל קישור דרך NFC:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"לפתיחת הקישור"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"‏אירעה שגיאת קריאה של NFC. יש לנסות שוב."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"‏אין אפליקציה תומכת לתג NFC זה"</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 35a90f2..e4713ea 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -12,10 +12,10 @@
     <string name="beam_canceled" msgid="5425192751826544741">"ビームをキャンセルしました"</string>
     <string name="cancel" msgid="61873902552555096">"キャンセル"</string>
     <string name="beam_tap_to_view" msgid="7430394753262448349">"タップして表示"</string>
-    <string name="beam_handover_not_supported" msgid="4083165921751489015">"受信側のデバイスは、ビーム経由のサイズの大きなファイルの転送をサポートしていません。"</string>
-    <string name="beam_try_again" msgid="3364677301009783455">"デバイス同士をもう一度近づける"</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="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>
@@ -34,7 +34,7 @@
     <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="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>
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"タブレットで NFC を使用してリンクを受信しました。"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"スマートフォンで NFC を使用してリンクを受信しました。"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"リンクを開く"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"NFC 読み取りエラーが発生しました。もう一度お試しください。"</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"この NFC タグをサポートしているアプリはありません"</string>
 </resources>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 782ebb9..1a399d9 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"თქვენმა ტაბლეტმა მიიღო ბმული NFC-ს მეშვეობით:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"თქვენმა ტელეფონმა მიიღო ბმული NFC-ს მეშვეობით:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"ბმულის გახსნა"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"NFC-ს წაკითხვის შეცდომა. ცადეთ ისევ."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"ამ NFC ტეგისთვის არცერთი მხარდაჭერილი აპლიკაცია არ მოიძებნა"</string>
 </resources>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 3e5e1b1..01a414a 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"Планшетіңіз NFC арқылы сілтеме алды:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"Телефоныңыз NFC арқылы сілтеме алды:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"Сілтемені ашу"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"NFC қатесі шықты. Қайталап көріңіз."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"Осы NFC картасы үшін бірде-бір қолдау көрсетілетін қолданба жоқ"</string>
 </resources>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 2336578..6bed2c0 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"ថេប្លេតរបស់អ្នកទទួលបានតំណមួយតាមរយៈ NFC៖"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"ទូរសព្ទរបស់អ្នកទទួលបានតំណមួយតាមរយៈ NFC៖"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"បើក​តំណ"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"មាន​បញ្ហា​ក្នុងការអាន NFC ។ សូមព្យាយាមម្ដងទៀត។"</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"មិន​មាន​កម្មវិធី​ដែលអាចប្រើ​ស្លាក NFC នេះទេ"</string>
 </resources>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index bffc7b4..dcd6e28 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ NFC ಮೂಲಕ ಲಿಂಕ್ ಸ್ವೀಕರಿಸಿದೆ:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"ನಿಮ್ಮ ಫೋನ್ NFC ಮೂಲಕ ಲಿಂಕ್ ಸ್ವೀಕರಿಸಿದೆ:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"ಲಿಂಕ್ ತೆರೆಯಿರಿ"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"NFC ಓದುವಲ್ಲಿ ದೋಷ. ಪುನಃ ಪ್ರಯತ್ನಿಸಿ."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"ಈ NFC ಟ್ಯಾಗ್‌ಗೆ ಯಾವುದೇ ಆ್ಯಪ್‌ ಬೆಂಬಲಿಸುವುದಿಲ್ಲ"</string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 9616f00..91c4458 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"태블릿에서 NFC를 통해 링크 수신:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"휴대전화에서 NFC를 통해 링크 수신:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"링크 열기"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"NFC 읽기 오류입니다. 다시 시도하세요."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"이 NFC 태그에 지원되는 애플리케이션이 없습니다."</string>
 </resources>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 7b2b8ca..c56a965 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"Планшетиңизге NFC аркылуу шилтеме келди:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"Телефонуңузга NFC аркылуу шилтеме келди:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"Шилтемени ачуу"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"NFC\'ни окууда ката кетти. Кайра аракет кылыңыз."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"Бул NFC энбелгиси үчүн колдоого алынган колдонмо жок"</string>
 </resources>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index c31d66e..560062e 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"ແທັບເລັດຂອງທ່ານໄດ້ຮັບລິ້ງຜ່ານທາງ NFC:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"ໂທລະສັບຂອງທ່ານໄດ້ຮັບລິ້ງຜ່ານທາງ NFC:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"ເປີດລິ້ງ"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"ການອ່ານ NFC ຜິດພາດ. ກະລຸນາລອງໃໝ່."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"ບໍ່ມີແອັບພລິເຄຊັນທີ່ຮອງຮັບແທັກ NFC ນີ້"</string>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index e95a240..b5b01f7 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"Planšetiniame kompiuteryje gauta nuoroda naudojant ALR:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"Telefone gauta nuoroda naudojant ALR:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"Atidaryti nuorodą"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"ALR nuskaitymo klaida. Bandykite dar kartą."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"Nėra šią ALR žymą palaikančių programų"</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 95fe35c..25b17e2 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"Jūsu planšetdatorā tika saņemta saite, izmantojot NFC:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"Jūsu tālrunī tika saņemta saite, izmantojot NFC:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"Atvērt saiti"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"NFC lasīšanas kļūda. Mēģiniet vēlreiz."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"Šī NFC atzīme netiek atbalstīta nevienā lietojumprogrammā"</string>
 </resources>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 0c7d6d2..ac04453 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"Вашиот таблет доби линк преку NFC:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"Вашиот телефон доби линк преку NFC:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"Отвори ја врската"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"Грешка при читањето на NFC. Обидете се повторно."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"Нема поддржана апликација за оваа ознака за NFC"</string>
 </resources>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index f119c2f..be4807e 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"നിങ്ങളുടെ ടാബ്‌ലെറ്റിന് NFC വഴി ഒരു ലിങ്ക് ലഭിച്ചു:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"നിങ്ങളുടെ ഫോണിന് NFC വഴി ഒരു ലിങ്ക് ലഭിച്ചു:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"ലിങ്ക് തുറക്കുക"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"NFC റീഡ് ചെയ്യുന്നതിൽ പിശക്. വീണ്ടും ശ്രമിക്കുക."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"ഈ NFC ടാഗിനെ പിന്തുണയ്ക്കുന്ന ആപ്പുകളൊന്നുമില്ല"</string>
 </resources>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 728af47..2c6e085 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"Таны таблет NFC-р холбоос авсан байна:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"Таны утас NFC-р холбоос авсан байна:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"Холбоосыг нээх"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"NFC-г уншихад алдаа гарлаа. Дахин оролдоно уу."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"Энэ NFC Шошгыг зохицуулах боломжтой дэмжигдсэн апп алга"</string>
 </resources>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index ea14b06..948aacc 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -27,24 +27,26 @@
     <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="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 Beam ला सक्षम करण्यासाठी NFC आवश्यक आहे. आपण हे सक्षम करू इच्छिता?"</string>
+    <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android Beam ला सक्षम करण्यासाठी NFC आवश्यक आहे. तुम्ही हे सक्षम करू इच्छिता?"</string>
     <string name="android_beam" msgid="1666446406999492763">"Android बीम"</string>
     <string name="beam_requires_external_storage_permission" msgid="8798337545702206901">"अॅप्लिकेशनला बाह्य स्टोरेज परवानगी नाही. ही फाइल बीम करण्यासाठी हे आवश्यक आहे"</string>
     <string name="title_confirm_url_open" msgid="8069968913244794478">"लिंक उघडायची का?"</string>
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"तुमच्या टॅबलेटला NFC वरून एक लिंक मिळाली आहे:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"तुमच्या फोनला NFC वरून एक लिंक मिळाली आहे:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"लिंक उघडा"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"NFC वाचण्यात एरर आली. पुन्हा प्रयत्न करा."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"या NFC टॅग साठी कोणतेही सपोर्ट करणारे अॅप्लिकेशन नाही"</string>
 </resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 643180a..eb873c4 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"Tablet anda menerima pautan melalui NFC:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"Telefon anda menerima pautan melalui NFC:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"Buka pautan"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"Ralat baca NFC. Cuba lagi."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"Tiada aplikasi yang disokong untuk Teg NFC ini"</string>
 </resources>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index dcfa8fe..f95f865 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"သင့်တက်ဘလက်သည် NFC မှတစ်ဆင့် လင့်ခ်တစ်ခု လက်ခံရရှိထားပါသည်-"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"သင့်ဖုန်းသည် NFC မှတစ်ဆင့် လင့်ခ်တစ်ခု လက်ခံရရှိထားပါသည်-"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"လင့်ခ်ဖွင့်ရန်"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"NFC ဖတ်ရှုမှု အမှားရှိနေသည်။ ထပ်စမ်းကြည့်ပါ။"</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"ဤ \'NFC တဂ်\' အတွက် ပံ့ပိုးထားသော အပလီကေးရှင်း မရှိပါ"</string>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index dbfc2d5..5a4f37b 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"Nettbrettet ditt mottok en link via NFC:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"Telefonen din mottok en link via NFC:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"Åpne link"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"NFC-lesefeil. Prøv på nytt."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"Ingen apper støttes for denne NFC-brikken"</string>
 </resources>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 5119190..d841a49 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -4,7 +4,7 @@
     <string name="app_name" msgid="78565911793142902">"Nfc सेवा"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"Nfc"</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC सक्षम"</string>
-    <string name="tap_to_beam" msgid="5819197866281059878">"बिम गर्नका लागि ट्याप गर्नुहोस्"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"बिम गर्नाका लागि ट्याप गर्नुहोस्"</string>
     <string name="beam_progress" msgid="7453634884807323920">"आगमन बिम..."</string>
     <string name="beam_outgoing" msgid="4679536649779123495">"बिम गर्दै..."</string>
     <string name="beam_complete" msgid="477026736424637435">"बिम पुरा भयो"</string>
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"तपाईंको ट्याब्लेटमा NFC मार्फत एउटा लिंक आयो:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"तपाईंको फोनमा NFC मार्फत एउटा लिंक आयो:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"लिंक खोल्नुहोस्"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"NFC पढ्ने क्रममा त्रुटि भयो। फेरि प्रयास गर्नुहोस्‌।"</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"यो NFC ट्यागको कुनै पनि समर्थित अनुप्रयोग छैन"</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index f8aedc9..ce59f1d 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"Je tablet heeft een link ontvangen via NFC:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"Je telefoon heeft een link ontvangen via NFC:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"Link openen"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"Fout bij lezen NFC. Probeer het opnieuw."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"Geen ondersteunde app voor deze NFC-tag"</string>
 </resources>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
new file mode 100644
index 0000000..e6dabcc
--- /dev/null
+++ b/res/values-or/strings.xml
@@ -0,0 +1,52 @@
+<?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="accessibility_nfc_enabled" msgid="7796246979948787735">"NFC ସକ୍ଷମିତ।"</string>
+    <string name="tap_to_beam" msgid="5819197866281059878">"ବିମ୍‌ କରିବା ପାଇଁ ଟାପ୍‌ କରନ୍ତୁ"</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_tap_to_view" msgid="7430394753262448349">"ଦେଖିବା ପାଇଁ ଟାପ୍‌ କରନ୍ତୁ"</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">"ବ୍ଲୁ-ଟୂଥ୍‌ ସକ୍ଷମ କରିହେଲା ନାହିଁ"</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_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 Beam ପାଇଁ NFC ସକ୍ଷମ ଥିବା ଆବଶ୍ୟକ। ଆପଣ ଏହାକୁ ସକ୍ଷମ କରିବେ କି?"</string>
+    <string name="android_beam" msgid="1666446406999492763">"Android ବିମ୍‌"</string>
+    <string name="beam_requires_external_storage_permission" msgid="8798337545702206901">"ଆପ୍ଲୀକେଶନ୍‌କୁ ଏକ୍ସଟର୍ନଲ୍‌ ଷ୍ଟୋରେଜ୍‌ରେ ଲେଖିବାର ଅନୁମତି ନାହିଁ। ଏହି ଫାଇଲ୍‌କୁ ବିମ୍‌ କରିବା ଲାଗି ଏହାର ଅନୁମତି ଆବଶ୍ୟକ"</string>
+    <string name="title_confirm_url_open" msgid="8069968913244794478">"ଲିଙ୍କ ଖୋଲିବେ?"</string>
+    <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"ଆପଣଙ୍କ ଟାବଲେଟ୍‌କୁ NFC ମାଧ୍ୟମରେ ଏକ ଲିଙ୍କ ଆସିଛି:"</string>
+    <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"ଆପଣଙ୍କ ଫୋନ୍‌କୁ NFC ମାଧ୍ୟମରେ ଏକ ଲିଙ୍କ ଆସିଛି:"</string>
+    <string name="action_confirm_url_open" msgid="3458322738812921189">"ଲିଙ୍କ ଖୋଲନ୍ତୁ"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"NFC ରିଡ୍‌ କରିବା ବେଳେ ତ୍ରୁଟି। ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ।"</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"ଏହି NFC ଟ୍ୟାଗ୍‌ ପାଇଁ କୌଣସି ସାମର୍ଥିତ ଆପ୍ଲିକେସନ୍‌ ନାହିଁ"</string>
+</resources>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 41e4c24..6364cdc 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਨੂੰ NFC ਰਾਹੀਂ ਇੱਕ ਲਿੰਕ ਪ੍ਰਾਪਤ ਹੋਇਆ:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"ਤੁਹਾਡੇ ਫ਼ੋਨ ਨੂੰ NFC ਰਾਹੀਂ ਇੱਕ ਲਿੰਕ ਪ੍ਰਾਪਤ ਹੋਇਆ:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"ਲਿੰਕ ਖੋਲ੍ਹੋ"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"NFC ਪੜ੍ਹਨ ਵਿੱਚ ਗੜਬੜ ਹੋਈ। ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"ਇਸ NFC ਟੈਗ ਲਈ ਕੋਈ ਸਮਰਥਿਤ ਐਪਲੀਕੇਸ਼ਨ ਨਹੀਂ ਹੈ"</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index e58a66f..ad7ff4f 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"Na tablet został przesłany link przez NFC:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"Na telefon został przesłany link przez NFC:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"Otwórz link"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"Błąd odczytu tagu NFC. Spróbuj ponownie."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"Brak obsługiwanej aplikacji dla tego tagu NFC"</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 02cb195..1110429 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"O seu tablet recebeu um link através de NFC:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"O seu telemóvel recebeu um link através de NFC:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"Abrir link"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"Erro de leitura de NFC. Tente novamente."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"Não existe nenhuma aplicação suportada para esta etiqueta NFC."</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 4fe91ed..bdb3566 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"Seu tablet recebeu um link por NFC:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"Seu smartphone recebeu um link por NFC:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"Abrir link"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"Erro na leitura da NFC. Tente novamente."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"Nenhum aplicativo compatível com esta etiqueta NFC"</string>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 6117230..9f3e3df 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -43,8 +43,10 @@
     <string name="beam_requires_nfc_enabled" msgid="2800366967218600534">"Android Beam necesită activarea NFC. Activați?"</string>
     <string name="android_beam" msgid="1666446406999492763">"Android Beam"</string>
     <string name="beam_requires_external_storage_permission" msgid="8798337545702206901">"Aplicația nu are permisiune de stocare externă. Aceasta este necesară pentru transmiterea fișierului."</string>
-    <string name="title_confirm_url_open" msgid="8069968913244794478">"Deschideți linkul?"</string>
+    <string name="title_confirm_url_open" msgid="8069968913244794478">"Accesați linkul?"</string>
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"Tableta dvs. a primit un link prin NFC:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"Telefonul dvs. a primit un link prin NFC:"</string>
-    <string name="action_confirm_url_open" msgid="3458322738812921189">"Deschideți linkul"</string>
+    <string name="action_confirm_url_open" msgid="3458322738812921189">"Accesați linkul"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"Eroare de citire NFC. Încercați din nou."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"Nu există aplicații acceptate pentru această etichetă NFC"</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 7e51b45..47f3314 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"На ваш планшет по NFC поступила ссылка:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"На ваш телефон по NFC поступила ссылка:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"Открыть"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"Ошибка чтения NFC-метки. Повторите попытку."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"Для этой NFC-метки нет поддерживаемых приложений"</string>
 </resources>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 2b2fad5..5b0f6be 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"ඔබගේ ටැබ්ලට් පරිගණකයට NFC හරහා සබැඳියක් ලැබුණි:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"ඔබගේ දුරකථනයට NFC හරහා සබැඳියක් ලැබුණි:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"සබැඳිය විවෘත කරන්න"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"NFC කියවීමේ දෝෂයකි. නැවත උත්සාහ කරන්න."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"මෙම NFC ටැගය සඳහා සහාය දක්වන යෙදුම් නැත"</string>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index e1a0f3b..98dbbd1 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"Tablet dostal odkaz cez NFC:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"Telefón dostal odkaz cez NFC:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"Otvoriť odkaz"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"Chyba čítania značky NFC. Skúste to znova."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"Pre túto značku NFC nie je k dispozícii žiadna podporovaná aplikácia"</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index e71bf27..835b313 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"Tablični računalnik je prejel povezavo prek vmesnika NFC:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"Telefon je prejel povezavo prek vmesnika NFC:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"Odpri povezavo"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"Napaka pri branju oznake NFC. Poskusite znova."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"Za to oznako NFC ni podprta nobena aplikacija"</string>
 </resources>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 1f74259..9e01855 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"Tableti yt mori një lidhje nëpërmjet NFC-së:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"Telefoni yt mori një lidhje nëpërmjet NFC-së:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"Hap lidhjen"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"Gabim leximi për NFC-në. Provo përsëri."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"Nuk ka asnjë aplikacion të mbështetur për këtë etiketë NFC"</string>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index f987d88..80ee44e 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"Таблет је примио линк преко NFC-а:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"Телефон је примио линк преко NFC-а:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"Отвори линк"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"Дошло је до грешке у читању NFC ознаке. Пробајте поново."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"Ниједна апликација не подржава ову NFC ознаку"</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index c71bd54..7199876 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"En länk har skickats till surfplattan via NFC:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"En länk har skickats till mobilen via NFC:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"Öppna länk"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"NFC-läsfel. Försök igen."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"Ingen app har stöd för den här NFC-etiketten"</string>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 4e9a2fb..6e81c15 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"Kompyuta kibao yako imepokea kiungo kupitia NFC:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"Simu yako imepokea kiungo kupitia NFC:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"Fungua kiungo"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"Hitilafu ya kusoma NFC. Jaribu tena."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"Hakuna programu inayotumika katika Tagi hii ya NFC"</string>
 </resources>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 1355ba8..d524946 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"NFC வழியாக உங்கள் டேப்லெட்டுக்கு, ஒரு இணைப்பு வந்துள்ளது:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"NFC வழியாக உங்கள் ஃபோனுக்கு, ஒரு இணைப்பு வந்துள்ளது:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"இணைப்பைத் திற"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"NFC குறியைப் படிக்க இயலவில்லை. பிறகு முயலவும்."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"இந்த NFC குறிக்கு ஏற்ற ஆப்ஸ் இல்லை"</string>
 </resources>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index e38518e..7b641e3 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"మీ టాబ్లెట్ NFC ద్వారా లింక్‌ని పొందింది:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"మీ ఫోన్ NFC ద్వారా లింక్‌ని పొందింది:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"లింక్‌ని తెరవండి"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"NFC చదవడంలో ఎర్రర్. మళ్లీ ప్రయత్నించండి."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"NFC ట్యాగ్‌కి మద్దతు ఇచ్చే అప్లికేషన్ ఏదీ లేదు"</string>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index e17af86..602ad40 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"แท็บเล็ตได้รับลิงก์ทาง NFC:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"โทรศัพท์ได้รับลิงก์ทาง NFC:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"เปิดลิงก์"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"เกิดข้อผิดพลาดในการอ่าน NFC โปรดลองอีกครั้ง"</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"ไม่มีแอปพลิเคชันที่รองรับแท็ก NFC นี้"</string>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index ce706eb..1ac4f3f 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"Nakatanggap ng link ang iyong tablet sa pamamagitan ng NFC:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"Nakatanggap ng link ang iyong telepono sa pamamagitan ng NFC:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"Buksan ang link"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"Error sa pagbasa ng NFC. Subukang muli."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"Walang sinusuportahang application para sa Tag ng NFC na ito"</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index e4cfdca..afad452 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"Tabletiniz NFC üzerinden bir bağlantı aldı:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"Telefonunuz NFC üzerinden bir bağlantı aldı:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"Bağlantıyı aç"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"NFC okuma hatası. Tekrar deneyin."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"Bu NFC Etiketi için desteklenen uygulama yok"</string>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 16d554b..ec09179 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"На планшет надіслано посилання через зв’язок малого радіуса дії (NFC):"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"На телефон надіслано посилання через зв’язок малого радіуса дії (NFC):"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"Відкрити посилання"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"Помилка зчитування NFC-мітки. Повторіть спробу."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"Немає підтримуваного додатка для цієї NFC-мітки"</string>
 </resources>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 15064ae..e5fce14 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"‏NFC کے ذریعے آپ کے ٹیبلیٹ کو ایک لنک موصول ہوا ہے:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"‏NFC کے ذریعے آپ کے فون کو ایک لنک موصول ہوا ہے:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"لنک کھولیں"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"‏NFC پڑھنے میں خرابی۔ دوبارہ کوشش کریں۔"</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"‏اس NFC ٹیگ کے لیے کوئی تعاون یافتہ ایپلیکیشن نہیں ہے"</string>
 </resources>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index b5abd10..d9232a9 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"Planshetingizga NFC orqali havola keldi:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"Telefoningizga NFC orqali havola keldi:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"Havolani ochish"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"NFC yorliqni o‘qishda xato. Qaytadan urining."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"Mazkur NFC yorliq bilan ishlaydigan hech qanday ilova topilmadi"</string>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 09d6f98..6adb1e8 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -1,7 +1,7 @@
 <?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">"Dịch vụ Nfc"</string>
+    <string name="app_name" msgid="78565911793142902">"Dịch vụ NFC"</string>
     <string name="nfcUserLabel" msgid="7708535817084357357">"Nfc"</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"Đã bật NFC."</string>
     <string name="tap_to_beam" msgid="5819197866281059878">"Nhấn để truyền"</string>
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"Máy tính bảng của bạn đã nhận được một liên kết thông qua NFC:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"Điện thoại của bạn đã nhận được một liên kết thông qua NFC:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"Mở liên kết"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"Lỗi đọc thẻ NFC. Hãy thử lại."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"Không có ứng dụng nào hỗ trợ thẻ NFC này"</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 8e1fb70..df7bb7a 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"您的平板电脑已通过 NFC 收到一个链接："</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"您的手机已通过 NFC 收到一个链接："</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"打开链接"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"NFC 读取错误，请重试。"</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"没有应用支持此 NFC 标签"</string>
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 3f98aeb..8a17ce3 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"您的平板電腦已透過 NFC 收到一個連結："</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"您的手機已透過 NFC 收到一個連結："</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"開啟連結"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"NFC 讀取錯誤，請再試一次。"</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"沒有支援此 NFC 標籤的應用程式"</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 21a6036..70e2da8 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"你的平板電腦已透過 NFC 收到 1 個連結："</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"你的手機已透過 NFC 收到 1 個連結："</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"開啟連結"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"NFC 讀取錯誤，請再試一次。"</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"找不到支援這個 NFC 標記的應用程式"</string>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 8005b20..d7598e6 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -47,4 +47,6 @@
     <string name="summary_confirm_url_open" product="tablet" msgid="3353502750736192055">"Ithebhulethi yakho ithole isixhumanisi nge-NFC:"</string>
     <string name="summary_confirm_url_open" product="default" msgid="1246398412196449226">"Ifoni yakho ithole isixhumanisi nge-NFC:"</string>
     <string name="action_confirm_url_open" msgid="3458322738812921189">"Vula isixhumanisi"</string>
+    <string name="tag_read_error" msgid="2485274498885877547">"Iphutha lokufunda le-NFC. Zama futhi."</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"Uhlelo lokusebenza olungasekelwa lale thegi ye-NFC Tag"</string>
 </resources>
diff --git a/src/com/android/nfc/ForegroundUtils.java b/src/com/android/nfc/ForegroundUtils.java
index e5c3491..d718537 100644
--- a/src/com/android/nfc/ForegroundUtils.java
+++ b/src/com/android/nfc/ForegroundUtils.java
@@ -175,6 +175,9 @@
         }
     }
 
+    @Override
+    public void onForegroundServicesChanged(int pid, int uid, int fgServiceTypes) {
+    }
 
     @Override
     public void onProcessDied(int pid, int uid) throws RemoteException {
diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java
index 1bbc267..839be68 100644
--- a/src/com/android/nfc/NfcService.java
+++ b/src/com/android/nfc/NfcService.java
@@ -22,6 +22,7 @@
 import android.app.KeyguardManager;
 import android.app.PendingIntent;
 import android.app.admin.DevicePolicyManager;
+import android.app.BroadcastOptions;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.ContentResolver;
@@ -35,6 +36,7 @@
 import android.content.pm.PackageManager;
 import android.content.pm.UserInfo;
 import android.content.res.Resources.NotFoundException;
+import android.media.AudioAttributes;
 import android.media.AudioManager;
 import android.media.SoundPool;
 import android.net.Uri;
@@ -535,7 +537,14 @@
     void initSoundPool() {
         synchronized (this) {
             if (mSoundPool == null) {
-                mSoundPool = new SoundPool(1, AudioManager.STREAM_NOTIFICATION, 0);
+                mSoundPool = new SoundPool.Builder()
+                        .setMaxStreams(1)
+                        .setAudioAttributes(
+                                new AudioAttributes.Builder()
+                                        .setUsage(AudioAttributes.USAGE_ASSISTANCE_SONIFICATION)
+                                        .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
+                                        .build())
+                        .build();
                 mStartSound = mSoundPool.load(mContext, R.raw.start, 1);
                 mEndSound = mSoundPool.load(mContext, R.raw.end, 1);
                 mErrorSound = mSoundPool.load(mContext, R.raw.error, 1);
@@ -2367,10 +2376,13 @@
                 }
                 String url = new String ("nfc://secure:0/" + reader + "/" + aidString.toString());
                 intent.setData(Uri.parse(url));
+
+                final BroadcastOptions options = BroadcastOptions.makeBasic();
+                options.setBackgroundActivityStartsAllowed(true);
                 for (int i = 0; i < nfcAccess.length; i++) {
                     if (nfcAccess[i]) {
                         intent.setPackage(mNfcEventInstalledPackages.get(i));
-                        mContext.sendBroadcast(intent);
+                        mContext.sendBroadcast(intent, null, options.toBundle());
                     }
                 }
             } catch (RemoteException e) {
diff --git a/src/com/android/nfc/beam/BeamTransferManager.java b/src/com/android/nfc/beam/BeamTransferManager.java
index 08372b8..eff9d6b 100644
--- a/src/com/android/nfc/beam/BeamTransferManager.java
+++ b/src/com/android/nfc/beam/BeamTransferManager.java
@@ -45,7 +45,7 @@
 import java.util.HashMap;
 import java.util.Locale;
 
-import android.support.v4.content.FileProvider;
+import androidx.core.content.FileProvider;
 
 /**
  * A BeamTransferManager object represents a set of files
diff --git a/src/com/android/nfc/cardemulation/HostEmulationManager.java b/src/com/android/nfc/cardemulation/HostEmulationManager.java
index a33301e..df701f2 100644
--- a/src/com/android/nfc/cardemulation/HostEmulationManager.java
+++ b/src/com/android/nfc/cardemulation/HostEmulationManager.java
@@ -311,7 +311,8 @@
             Intent aidIntent = new Intent(HostApduService.SERVICE_INTERFACE);
             aidIntent.setComponent(service);
             if (mContext.bindServiceAsUser(aidIntent, mConnection,
-                    Context.BIND_AUTO_CREATE, UserHandle.CURRENT)) {
+                    Context.BIND_AUTO_CREATE | Context.BIND_ALLOW_BACKGROUND_ACTIVITY_STARTS,
+                    UserHandle.CURRENT)) {
                 mServiceBound = true;
             } else {
                 Log.e(TAG, "Could not bind service.");
@@ -369,7 +370,8 @@
         intent.setComponent(service);
         mLastBoundPaymentServiceName = service;
         if (mContext.bindServiceAsUser(intent, mPaymentConnection,
-                Context.BIND_AUTO_CREATE, new UserHandle(userId))) {
+                Context.BIND_AUTO_CREATE | Context.BIND_ALLOW_BACKGROUND_ACTIVITY_STARTS,
+                new UserHandle(userId))) {
           mPaymentServiceBound = true;
         } else {
             Log.e(TAG, "Could not bind (persistent) payment service.");