Revert "Revert "Revert "Path fix for backend connection to FE upon call disconnection""" am: bd6ca81fa3
am: 2205dad1ff

Change-Id: I39b75da26462859c1903e668f3100539bd75bf23
diff --git a/ShamuLayout/res/values-kn-rIN/strings.xml b/ShamuLayout/res/values-kn-rIN/strings.xml
index cf64f38..057af0b 100644
--- a/ShamuLayout/res/values-kn-rIN/strings.xml
+++ b/ShamuLayout/res/values-kn-rIN/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="4827444239162090155">"Nexus 6 ಹೋಮ್‌ ಪರದೆ"</string>
+    <string name="app_label" msgid="4827444239162090155">"Nexus 6 ಮುಖಪುಟ‌ ಪರದೆ"</string>
     <string name="google_folder_title" msgid="3050712152111669078">"Google"</string>
     <string name="create_folder_title" msgid="1626185277541881691">"ರಚಿಸಿ"</string>
     <string name="play_folder_title" msgid="8796147714003891112">"Play"</string>
diff --git a/device.mk b/device.mk
index a05b9b8..d933bbe 100644
--- a/device.mk
+++ b/device.mk
@@ -411,3 +411,7 @@
 # OEM Unlock reporting
 ADDITIONAL_DEFAULT_PROPERTIES += \
     ro.oem_unlock_supported=1
+
+# ro.product.first_api_level indicates the first api level the device has commercially launched on.
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.product.first_api_level=21
diff --git a/init.shamu.rc b/init.shamu.rc
index 6397977..69083d2 100644
--- a/init.shamu.rc
+++ b/init.shamu.rc
@@ -255,7 +255,6 @@
 
 # msm specific files that need to be created on /data
 on post-fs-data
-    mkdir /data/misc/bluetooth 0770 bluetooth bluetooth
 
     # Create the directories used by the Wireless subsystem
     mkdir /data/misc/wifi 0770 wifi wifi