diff --git a/audio/mixer_paths_qrd_sku1.xml b/audio/mixer_paths_qrd_sku1.xml
index 9824aec..75a500c 100644
--- a/audio/mixer_paths_qrd_sku1.xml
+++ b/audio/mixer_paths_qrd_sku1.xml
@@ -291,6 +291,16 @@
         <path name="deep-buffer-playback bt-sco" />
     </path>
 
+    <path name="deep-buffer-playback speaker-and-bt-sco">
+         <path name="deep-buffer-playback bt-sco" />
+         <path name="deep-buffer-playback" />
+    </path>
+
+   <path name="deep-buffer-playback speaker-and-bt-sco-wb">
+        <path name="deep-buffer-playback bt-sco-wb" />
+        <path name="deep-buffer-playback" />
+   </path>
+
     <path name="deep-buffer-playback afe-proxy">
         <ctl name="AFE_PCM_RX Audio Mixer MultiMedia1" value="1" />
     </path>
@@ -325,6 +335,16 @@
         <path name="low-latency-playback bt-sco" />
     </path>
 
+    <path name="low-latency-playback speaker-and-bt-sco">
+         <path name="low-latency-playback bt-sco" />
+         <path name="low-latency-playback" />
+    </path>
+
+    <path name="low-latency-playback speaker-and-bt-sco-wb">
+         <path name="low-latency-playback bt-sco-wb" />
+         <path name="low-latency-playback" />
+    </path>
+
     <path name="low-latency-playback afe-proxy">
         <ctl name="AFE_PCM_RX Audio Mixer MultiMedia5" value="1" />
     </path>
@@ -358,6 +378,16 @@
         <path name="compress-offload-playback bt-sco" />
     </path>
 
+    <path name="compress-offload-playback speaker-and-bt-sco">
+         <path name="compress-offload-playback bt-sco" />
+         <path name="compress-offload-playback" />
+    </path>
+
+    <path name="compress-offload-playback speaker-and-bt-sco-wb">
+         <path name="compress-offload-playback bt-sco-wb" />
+         <path name="compress-offload-playback" />
+    </path>
+
     <path name="compress-offload-playback afe-proxy">
         <ctl name="AFE_PCM_RX Audio Mixer MultiMedia4" value="1" />
     </path>
@@ -1016,6 +1046,16 @@
     <path name="bt-sco-mic">
     </path>
 
+    <path name="speaker-and-bt-sco">
+         <path name="speaker" />
+         <path name="bt-sco-headset" />
+    </path>
+
+    <path name="speaker-and-bt-sco-wb">
+         <path name="speaker" />
+         <path name="bt-sco-headset-wb" />
+    </path>
+
     <path name="bt-sco-headset-wb">
     </path>
 
diff --git a/bluetooth/bdroid_buildcfg.h b/bluetooth/bdroid_buildcfg.h
index 9e2f232..2ce5386 100644
--- a/bluetooth/bdroid_buildcfg.h
+++ b/bluetooth/bdroid_buildcfg.h
@@ -26,6 +26,7 @@
 #define BLE_PERIPHERAL_ADV_NAME  FALSE
 #define BT_CLEAN_TURN_ON_DISABLED 1
 #define BTA_DISABLE_DELAY 1000
+#define BTM_SCO_ENHANCED_SYNC_DISABLED TRUE
 #define BTM_WBS_INCLUDED TRUE
 #define BTIF_HF_WBS_PREFERRED TRUE
 #endif
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 8e4d9e5..c6cf23c 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -321,4 +321,6 @@
     <!-- Flag specifying whether or not IMS will use the ImsResolver dynamically -->
     <bool name="config_dynamic_bind_ims">true</bool>
 
+     <!-- Boolean indicating if current platform supports HFP inband ringing -->
+     <bool name="config_bluetooth_hfp_inband_ringing_support">true</bool>
 </resources>