diff --git a/universal7885-common/configs/permissions/component-overrides-bluetooth.xml b/universal7885-common/configs/permissions/component-overrides-bluetooth.xml
index 9ce4646..4e60b93 100644
--- a/universal7885-common/configs/permissions/component-overrides-bluetooth.xml
+++ b/universal7885-common/configs/permissions/component-overrides-bluetooth.xml
@@ -15,12 +15,12 @@
 -->
 <config>
     <component-override package="com.android.bluetooth" >
-    	<component class=".a2dpsink.A2dpSinkService" enabled="true" />
-        <component class=".avrcpcontroller.AvrcpControllerService" enabled="true" />
-        <component class=".avrcpcontroller.BluetoothMediaBrowserService" enabled="true" />
-        <component class=".hfpclient.connserv.HeadsetClientService" enabled="true" />
-	<component class=".hfpclient.HeadsetClientService" enabled="true" />
-	<component class=".hfpclient.connserv.HfpClientConnectionService" enabled="true" />
+    	<component class=".a2dpsink.A2dpSinkService" enabled="false" />
+        <component class=".avrcpcontroller.AvrcpControllerService" enabled="false" />
+        <component class=".avrcpcontroller.BluetoothMediaBrowserService" enabled="false" />
+        <component class=".hfpclient.connserv.HeadsetClientService" enabled="false" />
+	<component class=".hfpclient.HeadsetClientService" enabled="false" />
+	<component class=".hfpclient.connserv.HfpClientConnectionService" enabled="false" />
         <component class=".sap.SapService" enabled="true" />
     </component-override>
 </config>
diff --git a/universal7885-common/overlay/packages/apps/Bluetooth/res/values/config.xml b/universal7885-common/overlay/packages/apps/Bluetooth/res/values/config.xml
index 89e45b1..b38f016 100644
--- a/universal7885-common/overlay/packages/apps/Bluetooth/res/values/config.xml
+++ b/universal7885-common/overlay/packages/apps/Bluetooth/res/values/config.xml
@@ -21,6 +21,10 @@
     <integer name="a2dp_source_codec_priority_aptx">2001</integer>
     <integer name="a2dp_source_codec_priority_aptx_hd">1001</integer>
     <integer name="a2dp_source_codec_priority_ldac">3001</integer>
-    <bool name="profile_supported_a2dp_sink">true</bool>
     <bool name="profile_supported_sap">true</bool>
+    
+    <!-- If true, we will require location to be enabled on the device to
+         fire Bluetooth LE scan result callbacks in addition to having one
+         of the location permissions. -->
+    <bool name="strict_location_check">false</bool>
 </resources>