diff --git a/audio/oriole/config/audio_platform_configuration.xml b/audio/oriole/config/audio_platform_configuration.xml
index 5fab66c..ef9dd79 100644
--- a/audio/oriole/config/audio_platform_configuration.xml
+++ b/audio/oriole/config/audio_platform_configuration.xml
@@ -206,13 +206,15 @@
         <usecase id="UC_LOW_LATENCY_PLAYBACK" type="playback">
             <be_cfg be_id="OUT_SPEAKER_BE_CFG" latency="20000"/>
             <be_cfg be_id="OUT_USB_HEADSET_BE_CFG" latency="10000"/>
-	    <be_cfg be_id="OUT_A2DP_BE_CFG" latency="100000"/>
+            <be_cfg be_id="OUT_USB_HEADPHONE_BE_CFG" latency="10000"/>
+            <be_cfg be_id="OUT_A2DP_BE_CFG" latency="100000"/>
         </usecase>
 
         <usecase id="UC_DEEP_BUFFER_PLAYBACK" type="playback">
             <be_cfg be_id="OUT_SPEAKER_BE_CFG" latency="70000"/>
-	    <be_cfg be_id="OUT_USB_HEADSET_BE_CFG" latency="70000"/>
-	    <be_cfg be_id="OUT_A2DP_BE_CFG" latency="280000"/>
+            <be_cfg be_id="OUT_USB_HEADSET_BE_CFG" latency="70000"/>
+            <be_cfg be_id="OUT_USB_HEADPHONE_BE_CFG" latency="70000"/>
+            <be_cfg be_id="OUT_A2DP_BE_CFG" latency="280000"/>
         </usecase>
 
         <usecase id="UC_AUDIO_RECORD" type="capture">
@@ -221,11 +223,11 @@
             <be_cfg be_id="IN_CAMCORDER_PORTRAIT_BE_CFG" latency="160000"/>
             <be_cfg be_id="IN_CAMCORDER_SELFIE_LANDSCAPE_BE_CFG" latency="160000"/>
             <be_cfg be_id="IN_CAMCORDER_SELFIE_INVERT_LANDSCAPE_BE_CFG" latency="160000"/>
-	    <be_cfg be_id="IN_CAMCORDER_SELFIE_PORTRAIT_BE_CFG" latency="160000"/>
-	    <be_cfg be_id="IN_BTSCO_MIC_BE_CFG" latency="40000"/>
-	    <be_cfg be_id="IN_BTSCO_MIC_NREC_BE_CFG" latency="40000"/>
-	    <be_cfg be_id="IN_BTSCO_MIC_WB_BE_CFG" latency="40000"/>
-	    <be_cfg be_id="IN_BTSCO_MIC_WB_NREC_BE_CFG" latency="40000"/>
+            <be_cfg be_id="IN_CAMCORDER_SELFIE_PORTRAIT_BE_CFG" latency="160000"/>
+            <be_cfg be_id="IN_BTSCO_MIC_BE_CFG" latency="40000"/>
+            <be_cfg be_id="IN_BTSCO_MIC_NREC_BE_CFG" latency="40000"/>
+            <be_cfg be_id="IN_BTSCO_MIC_WB_BE_CFG" latency="40000"/>
+            <be_cfg be_id="IN_BTSCO_MIC_WB_NREC_BE_CFG" latency="40000"/>
         </usecase>
     </dsp_latency>
 
diff --git a/audio/raven/config/audio_platform_configuration.xml b/audio/raven/config/audio_platform_configuration.xml
index 5fab66c..ef9dd79 100644
--- a/audio/raven/config/audio_platform_configuration.xml
+++ b/audio/raven/config/audio_platform_configuration.xml
@@ -206,13 +206,15 @@
         <usecase id="UC_LOW_LATENCY_PLAYBACK" type="playback">
             <be_cfg be_id="OUT_SPEAKER_BE_CFG" latency="20000"/>
             <be_cfg be_id="OUT_USB_HEADSET_BE_CFG" latency="10000"/>
-	    <be_cfg be_id="OUT_A2DP_BE_CFG" latency="100000"/>
+            <be_cfg be_id="OUT_USB_HEADPHONE_BE_CFG" latency="10000"/>
+            <be_cfg be_id="OUT_A2DP_BE_CFG" latency="100000"/>
         </usecase>
 
         <usecase id="UC_DEEP_BUFFER_PLAYBACK" type="playback">
             <be_cfg be_id="OUT_SPEAKER_BE_CFG" latency="70000"/>
-	    <be_cfg be_id="OUT_USB_HEADSET_BE_CFG" latency="70000"/>
-	    <be_cfg be_id="OUT_A2DP_BE_CFG" latency="280000"/>
+            <be_cfg be_id="OUT_USB_HEADSET_BE_CFG" latency="70000"/>
+            <be_cfg be_id="OUT_USB_HEADPHONE_BE_CFG" latency="70000"/>
+            <be_cfg be_id="OUT_A2DP_BE_CFG" latency="280000"/>
         </usecase>
 
         <usecase id="UC_AUDIO_RECORD" type="capture">
@@ -221,11 +223,11 @@
             <be_cfg be_id="IN_CAMCORDER_PORTRAIT_BE_CFG" latency="160000"/>
             <be_cfg be_id="IN_CAMCORDER_SELFIE_LANDSCAPE_BE_CFG" latency="160000"/>
             <be_cfg be_id="IN_CAMCORDER_SELFIE_INVERT_LANDSCAPE_BE_CFG" latency="160000"/>
-	    <be_cfg be_id="IN_CAMCORDER_SELFIE_PORTRAIT_BE_CFG" latency="160000"/>
-	    <be_cfg be_id="IN_BTSCO_MIC_BE_CFG" latency="40000"/>
-	    <be_cfg be_id="IN_BTSCO_MIC_NREC_BE_CFG" latency="40000"/>
-	    <be_cfg be_id="IN_BTSCO_MIC_WB_BE_CFG" latency="40000"/>
-	    <be_cfg be_id="IN_BTSCO_MIC_WB_NREC_BE_CFG" latency="40000"/>
+            <be_cfg be_id="IN_CAMCORDER_SELFIE_PORTRAIT_BE_CFG" latency="160000"/>
+            <be_cfg be_id="IN_BTSCO_MIC_BE_CFG" latency="40000"/>
+            <be_cfg be_id="IN_BTSCO_MIC_NREC_BE_CFG" latency="40000"/>
+            <be_cfg be_id="IN_BTSCO_MIC_WB_BE_CFG" latency="40000"/>
+            <be_cfg be_id="IN_BTSCO_MIC_WB_NREC_BE_CFG" latency="40000"/>
         </usecase>
     </dsp_latency>
 
diff --git a/audio/slider/config/audio_platform_configuration.xml b/audio/slider/config/audio_platform_configuration.xml
index 2c78ee1..f379b99 100644
--- a/audio/slider/config/audio_platform_configuration.xml
+++ b/audio/slider/config/audio_platform_configuration.xml
@@ -144,13 +144,15 @@
         <usecase id="UC_LOW_LATENCY_PLAYBACK" type="playback">
             <be_cfg be_id="OUT_SPEAKER_BE_CFG" latency="20000"/>
             <be_cfg be_id="OUT_USB_HEADSET_BE_CFG" latency="10000"/>
-	    <be_cfg be_id="OUT_A2DP_BE_CFG" latency="100000"/>
+            <be_cfg be_id="OUT_USB_HEADPHONE_BE_CFG" latency="10000"/>
+            <be_cfg be_id="OUT_A2DP_BE_CFG" latency="100000"/>
         </usecase>
 
         <usecase id="UC_DEEP_BUFFER_PLAYBACK" type="playback">
             <be_cfg be_id="OUT_SPEAKER_BE_CFG" latency="70000"/>
-	    <be_cfg be_id="OUT_USB_HEADSET_BE_CFG" latency="70000"/>
-	    <be_cfg be_id="OUT_A2DP_BE_CFG" latency="280000"/>
+            <be_cfg be_id="OUT_USB_HEADSET_BE_CFG" latency="70000"/>
+            <be_cfg be_id="OUT_USB_HEADPHONE_BE_CFG" latency="70000"/>
+            <be_cfg be_id="OUT_A2DP_BE_CFG" latency="280000"/>
         </usecase>
 
         <usecase id="UC_AUDIO_RECORD" type="capture">
@@ -159,11 +161,11 @@
             <be_cfg be_id="IN_CAMCORDER_PORTRAIT_BE_CFG" latency="160000"/>
             <be_cfg be_id="IN_CAMCORDER_SELFIE_LANDSCAPE_BE_CFG" latency="160000"/>
             <be_cfg be_id="IN_CAMCORDER_SELFIE_INVERT_LANDSCAPE_BE_CFG" latency="160000"/>
-	    <be_cfg be_id="IN_CAMCORDER_SELFIE_PORTRAIT_BE_CFG" latency="160000"/>
-	    <be_cfg be_id="IN_BTSCO_MIC_BE_CFG" latency="40000"/>
-	    <be_cfg be_id="IN_BTSCO_MIC_NREC_BE_CFG" latency="40000"/>
-	    <be_cfg be_id="IN_BTSCO_MIC_WB_BE_CFG" latency="40000"/>
-	    <be_cfg be_id="IN_BTSCO_MIC_WB_NREC_BE_CFG" latency="40000"/>
+            <be_cfg be_id="IN_CAMCORDER_SELFIE_PORTRAIT_BE_CFG" latency="160000"/>
+            <be_cfg be_id="IN_BTSCO_MIC_BE_CFG" latency="40000"/>
+            <be_cfg be_id="IN_BTSCO_MIC_NREC_BE_CFG" latency="40000"/>
+            <be_cfg be_id="IN_BTSCO_MIC_WB_BE_CFG" latency="40000"/>
+            <be_cfg be_id="IN_BTSCO_MIC_WB_NREC_BE_CFG" latency="40000"/>
         </usecase>
     </dsp_latency>
 
diff --git a/audio/whitefin/config/audio_platform_configuration.xml b/audio/whitefin/config/audio_platform_configuration.xml
index 2c78ee1..f379b99 100644
--- a/audio/whitefin/config/audio_platform_configuration.xml
+++ b/audio/whitefin/config/audio_platform_configuration.xml
@@ -144,13 +144,15 @@
         <usecase id="UC_LOW_LATENCY_PLAYBACK" type="playback">
             <be_cfg be_id="OUT_SPEAKER_BE_CFG" latency="20000"/>
             <be_cfg be_id="OUT_USB_HEADSET_BE_CFG" latency="10000"/>
-	    <be_cfg be_id="OUT_A2DP_BE_CFG" latency="100000"/>
+            <be_cfg be_id="OUT_USB_HEADPHONE_BE_CFG" latency="10000"/>
+            <be_cfg be_id="OUT_A2DP_BE_CFG" latency="100000"/>
         </usecase>
 
         <usecase id="UC_DEEP_BUFFER_PLAYBACK" type="playback">
             <be_cfg be_id="OUT_SPEAKER_BE_CFG" latency="70000"/>
-	    <be_cfg be_id="OUT_USB_HEADSET_BE_CFG" latency="70000"/>
-	    <be_cfg be_id="OUT_A2DP_BE_CFG" latency="280000"/>
+            <be_cfg be_id="OUT_USB_HEADSET_BE_CFG" latency="70000"/>
+            <be_cfg be_id="OUT_USB_HEADPHONE_BE_CFG" latency="70000"/>
+            <be_cfg be_id="OUT_A2DP_BE_CFG" latency="280000"/>
         </usecase>
 
         <usecase id="UC_AUDIO_RECORD" type="capture">
@@ -159,11 +161,11 @@
             <be_cfg be_id="IN_CAMCORDER_PORTRAIT_BE_CFG" latency="160000"/>
             <be_cfg be_id="IN_CAMCORDER_SELFIE_LANDSCAPE_BE_CFG" latency="160000"/>
             <be_cfg be_id="IN_CAMCORDER_SELFIE_INVERT_LANDSCAPE_BE_CFG" latency="160000"/>
-	    <be_cfg be_id="IN_CAMCORDER_SELFIE_PORTRAIT_BE_CFG" latency="160000"/>
-	    <be_cfg be_id="IN_BTSCO_MIC_BE_CFG" latency="40000"/>
-	    <be_cfg be_id="IN_BTSCO_MIC_NREC_BE_CFG" latency="40000"/>
-	    <be_cfg be_id="IN_BTSCO_MIC_WB_BE_CFG" latency="40000"/>
-	    <be_cfg be_id="IN_BTSCO_MIC_WB_NREC_BE_CFG" latency="40000"/>
+            <be_cfg be_id="IN_CAMCORDER_SELFIE_PORTRAIT_BE_CFG" latency="160000"/>
+            <be_cfg be_id="IN_BTSCO_MIC_BE_CFG" latency="40000"/>
+            <be_cfg be_id="IN_BTSCO_MIC_NREC_BE_CFG" latency="40000"/>
+            <be_cfg be_id="IN_BTSCO_MIC_WB_BE_CFG" latency="40000"/>
+            <be_cfg be_id="IN_BTSCO_MIC_WB_NREC_BE_CFG" latency="40000"/>
         </usecase>
     </dsp_latency>