diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f6a0716..b924263 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -120,6 +120,7 @@
             android:theme="@android:style/Theme.Translucent"
             android:label="@string/android_beam"
             android:noHistory="true"
+            android:exported="true"
             android:excludeFromRecents="true">
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
@@ -146,7 +147,8 @@
             android:process=":beam"
         />
 
-        <receiver android:name=".NfcBootCompletedReceiver">
+        <receiver android:name=".NfcBootCompletedReceiver"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
             </intent-filter>
diff --git a/nci/jni/NativeNfcManager.cpp b/nci/jni/NativeNfcManager.cpp
index c99e982..e2853bc 100644
--- a/nci/jni/NativeNfcManager.cpp
+++ b/nci/jni/NativeNfcManager.cpp
@@ -191,8 +191,7 @@
 }
 void initializeMfcReaderOption() {
   legacy_mfc_reader =
-      (NfcConfig::getUnsigned(NAME_LEGACY_MIFARE_READER, 0) != 0) ? true
-                                                                  : false;
+      (NfcConfig::getUnsigned(NAME_LEGACY_MIFARE_READER, 0) != 0) ? true : false;
 
   DLOG_IF(INFO, nfc_debug_enabled)
       << __func__ <<": mifare reader option=" << legacy_mfc_reader;
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index c95e261..66e875c 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -49,6 +49,4 @@
     <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>
-    <string name="nfc_blocking_alert_title" msgid="1086172436984457085">"‏قد تكون التقنية \"اتصال قصير المدى\" (NFC) محظورة"</string>
-    <string name="nfc_blocking_alert_message" msgid="7003156052570107490">"انقر لمعرفة كيف يمكنك حلّ هذه المشكلة."</string>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index f2097c1..cc29d6c 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -2,7 +2,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="78565911793142902">"Nfc Service"</string>
-    <string name="nfcUserLabel" msgid="7708535817084357357">"NFC"</string>
+    <string name="nfcUserLabel" msgid="7708535817084357357">"КБП"</string>
     <string name="accessibility_nfc_enabled" msgid="7796246979948787735">"КБП е активирана."</string>
     <string name="tap_to_beam" msgid="5819197866281059878">"Докоснете за излъчване"</string>
     <string name="beam_progress" msgid="7453634884807323920">"Входящо излъчване..."</string>
@@ -49,6 +49,4 @@
     <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>
-    <string name="nfc_blocking_alert_title" msgid="1086172436984457085">"Функцията NFC може да е блокирана"</string>
-    <string name="nfc_blocking_alert_message" msgid="7003156052570107490">"Докоснете, за да научите как да отстраните проблема."</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index b2ae007..32c3729 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -49,6 +49,4 @@
     <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>
-    <string name="nfc_blocking_alert_title" msgid="1086172436984457085">"‏ممکن است NFC (ارتباطات میدان‌نزدیک) مسدود باشد"</string>
-    <string name="nfc_blocking_alert_message" msgid="7003156052570107490">"برای آشنایی با نحوه برطرف کردن مشکل، ضربه بزنید."</string>
 </resources>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 6f84daf..d841a49 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -12,7 +12,7 @@
     <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_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>
@@ -48,7 +48,5 @@
     <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>
-    <string name="nfc_blocking_alert_title" msgid="1086172436984457085">"NFC माथि रोक लगाइएको हुन सक्छ"</string>
-    <string name="nfc_blocking_alert_message" msgid="7003156052570107490">"NFC माथि लगाइएको रोक हटाउने तरिका जान्न ट्याप गर्नुहोस्।"</string>
+    <string name="tag_dispatch_failed" msgid="3562984995049738400">"यो NFC ट्यागको कुनै पनि समर्थित अनुप्रयोग छैन"</string>
 </resources>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index d91c384..d524946 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -49,6 +49,4 @@
     <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>
-    <string name="nfc_blocking_alert_title" msgid="1086172436984457085">"NFC தடுக்கப்படலாம்"</string>
-    <string name="nfc_blocking_alert_message" msgid="7003156052570107490">"எப்படி சரிசெய்வது என்பதை அறிய தட்டவும்."</string>
 </resources>