diff --git a/audio/Bluetooth_cal.acdb b/audio/Bluetooth_cal.acdb
index d8dcc82..102c5c9 100644
--- a/audio/Bluetooth_cal.acdb
+++ b/audio/Bluetooth_cal.acdb
Binary files differ
diff --git a/audio/General_cal.acdb b/audio/General_cal.acdb
index cd13d93..61a4eea 100644
--- a/audio/General_cal.acdb
+++ b/audio/General_cal.acdb
Binary files differ
diff --git a/audio/Global_cal.acdb b/audio/Global_cal.acdb
index 277caa7..e756dec 100644
--- a/audio/Global_cal.acdb
+++ b/audio/Global_cal.acdb
Binary files differ
diff --git a/audio/Handset_cal.acdb b/audio/Handset_cal.acdb
index 2e38382..aef5b68 100644
--- a/audio/Handset_cal.acdb
+++ b/audio/Handset_cal.acdb
Binary files differ
diff --git a/audio/Hdmi_cal.acdb b/audio/Hdmi_cal.acdb
index bcd494d..8b16778 100644
--- a/audio/Hdmi_cal.acdb
+++ b/audio/Hdmi_cal.acdb
Binary files differ
diff --git a/audio/Headset_cal.acdb b/audio/Headset_cal.acdb
index c35d7bd..cfbbb83 100644
--- a/audio/Headset_cal.acdb
+++ b/audio/Headset_cal.acdb
Binary files differ
diff --git a/audio/Speaker_cal.acdb b/audio/Speaker_cal.acdb
index 69086a3..2531775 100644
--- a/audio/Speaker_cal.acdb
+++ b/audio/Speaker_cal.acdb
Binary files differ
diff --git a/audio/audio_effects.conf b/audio/audio_effects.conf
index 8f7d40c..8251520 100644
--- a/audio/audio_effects.conf
+++ b/audio/audio_effects.conf
@@ -21,15 +21,6 @@
   reverb {
     path /system/lib/soundfx/libreverbwrapper.so
   }
-  qcbassboost {
-    path /vendor/lib/soundfx/libqcbassboost.so
-  }
-  qcvirt {
-    path /vendor/lib/soundfx/libqcvirt.so
-  }
-  qcreverb {
-    path /vendor/lib/soundfx/libqcreverb.so
-  }
   visualizer_sw {
     path /system/lib/soundfx/libvisualizer.so
   }
@@ -39,6 +30,12 @@
   downmix {
     path /system/lib/soundfx/libdownmix.so
   }
+  mysound {
+    path /system/lib/libmysound.so
+  }
+  myspace {
+    path /system/lib/soundfx/libmyspace.so
+  }
   soundalive {
     path /system/lib/libaudiosa.so
   }
@@ -51,12 +48,6 @@
   pre_processing {
     path /system/lib/soundfx/libqcomvoiceprocessing.so
   }
-  offload_bundle {
-    path /system/lib/soundfx/libqcompostprocbundle.so
-  }
-  audio_pre_processing {
-    path /system/lib/soundfx/libqcomvoiceprocessing.so
-  }
 }
 
 # Default pre-processing library. Add to audio_effect.conf "libraries" section if
@@ -166,6 +157,30 @@
     library downmix
     uuid 93f04452-e4fe-41cc-91f9-e475b6d1d69f
   }
+  dha {
+    library proxy
+    uuid  37155c20-50bb-11e3-9fac-0002a5d5c51b
+      libsw {
+        library mysound
+        uuid 263a88e0-50b1-11e2-bcfd-0800200c9a66
+      }
+      libhw {
+        library offload
+        uuid  3ef69260-50bb-11e3-931e-0002a5d5c51b
+      }
+  }
+  sa3d {
+    library proxy
+    uuid  1c91fca0-664a-11e4-b8c2-0002a5d5c51b
+      libsw {
+        library myspace
+        uuid 3462a6e0-655a-11e4-8b67-0002a5d5c51b
+      }
+      libhw {
+        library offload
+        uuid  c7a84e61-eebe-4fcc-bc53-efcb841b4625
+      }
+  }
   loudness_enhancer {
     library loudness_enhancer
     uuid fa415329-2034-4bea-b5dc-5b381c8d1e2c
@@ -176,7 +191,7 @@
   }
   ns {
     library pre_processing
-    uuid 1d97bb0b-9e2f-4403-9ae3-58c2554306
+    uuid 1d97bb0b-9e2f-4403-9ae3-58c2554306f8
   }
 }
 
@@ -240,3 +255,13 @@
       aec {}
     }
   }
+  output_session_processing {
+    music {
+        soundalive {}
+        dha {}
+        sa3d {}
+    }
+    ring {
+        sa3d {}
+    }
+  }
diff --git a/audio/audio_policy.conf b/audio/audio_policy.conf
index 363d4be..b7b2336 100644
--- a/audio/audio_policy.conf
+++ b/audio/audio_policy.conf
@@ -3,9 +3,9 @@
 # Devices are designated by a string that corresponds to the enum in audio.h
 
 global_configuration {
-  attached_output_devices AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_TELEPHONY_TX
+  attached_output_devices AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_SPEAKER
   default_output_device AUDIO_DEVICE_OUT_SPEAKER
-  attached_input_devices AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_BACK_MIC|AUDIO_DEVICE_IN_THIRD_MIC|AUDIO_DEVICE_IN_REMOTE_SUBMIX|AUDIO_DEVICE_IN_FM_RX|AUDIO_DEVICE_IN_FM_RX_A2DP|AUDIO_DEVICE_IN_TELEPHONY_RX|AUDIO_DEVICE_IN_VOICE_CALL
+  attached_input_devices AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_BACK_MIC|AUDIO_DEVICE_IN_THIRD_MIC|AUDIO_DEVICE_IN_REMOTE_SUBMIX|AUDIO_DEVICE_IN_VOICE_CALL
 }
 
 # audio hardware module section: contains descriptors for all audio hw modules present on the
@@ -26,14 +26,14 @@
         sampling_rates 44100|48000
         channel_masks AUDIO_CHANNEL_OUT_STEREO
         formats AUDIO_FORMAT_PCM_16_BIT
-        devices AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_LINE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_FM|AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET
+        devices AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_EXTERNAL_WIFI|AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET
         flags AUDIO_OUTPUT_FLAG_PRIMARY
       }
       fast {
          sampling_rates 8000|11025|12000|16000|22050|24000|32000|44100|48000
          channel_masks AUDIO_CHANNEL_OUT_STEREO
          formats AUDIO_FORMAT_PCM_16_BIT
-         devices AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET
+         devices AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_EXTERNAL_WIFI|AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET
          flags AUDIO_OUTPUT_FLAG_FAST
       }
       hdmi {
@@ -44,26 +44,19 @@
         flags AUDIO_OUTPUT_FLAG_MULTI_CH
       }
       compress_offload {
-        sampling_rates 8000|11025|16000|22050|32000|44100|48000
+        sampling_rates 11025|16000|22050|32000|44100|48000
         channel_masks AUDIO_CHANNEL_OUT_MONO|AUDIO_CHANNEL_OUT_STEREO|AUDIO_CHANNEL_OUT_2POINT1|AUDIO_CHANNEL_OUT_QUAD|AUDIO_CHANNEL_OUT_PENTA|AUDIO_CHANNEL_OUT_5POINT1|AUDIO_CHANNEL_OUT_6POINT1|AUDIO_CHANNEL_OUT_7POINT1
-        formats AUDIO_FORMAT_MP3|AUDIO_FORMAT_AAC|AUDIO_FORMAT_AC3|AUDIO_FORMAT_EAC3
-        devices AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET
+        formats AUDIO_FORMAT_MP3|AUDIO_FORMAT_AAC_LC|AUDIO_FORMAT_AAC_HE_V1|AUDIO_FORMAT_AAC_HE_V2|AUDIO_FORMAT_AC3|AUDIO_FORMAT_E_AC3
+        devices AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_EXTERNAL_WIFI|AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET
         flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING
       }
-      voip_rx {
-        sampling_rates 8000|16000
-        channel_masks AUDIO_CHANNEL_OUT_MONO
-        formats AUDIO_FORMAT_PCM_16_BIT|AUDIO_FORMAT_AMR_NB|AUDIO_FORMAT_AMR_WB|AUDIO_FORMAT_QCELP|AUDIO_FORMAT_EVRC|AUDIO_FORMAT_EVRCB|AUDIO_FORMAT_EVRCWB|AUDIO_FORMAT_EVRCNW
-        devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_LINE
-        flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_VOIP_RX
-      }
     }
     inputs {
       primary {
         sampling_rates 8000|11025|12000|16000|22050|24000|32000|44100|48000
         channel_masks AUDIO_CHANNEL_IN_MONO|AUDIO_CHANNEL_IN_STEREO|AUDIO_CHANNEL_IN_FRONT_BACK|AUDIO_CHANNEL_IN_VOICE_UPLINK|AUDIO_CHANNEL_IN_VOICE_DNLINK
-        formats AUDIO_FORMAT_PCM_16_BIT|AUDIO_FORMAT_AMR_NB|AUDIO_FORMAT_AMR_WB|AUDIO_FORMAT_QCELP|AUDIO_FORMAT_EVRC|AUDIO_FORMAT_EVRCB|AUDIO_FORMAT_EVRCWB|AUDIO_FORMAT_EVRCNW
-        devices AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET|AUDIO_DEVICE_IN_WIRED_HEADSET|AUDIO_DEVICE_IN_WIRED_HEADPHONE|AUDIO_DEVICE_IN_AUX_DIGITAL|AUDIO_DEVICE_IN_VOICE_CALL|AUDIO_DEVICE_IN_BACK_MIC|AUDIO_DEVICE_IN_THIRD_MIC|AUDIO_DEVICE_IN_FM|AUDIO_DEVICE_IN_FM_RX|AUDIO_DEVICE_IN_FM_RX_A2DP
+        formats AUDIO_FORMAT_PCM_16_BIT
+        devices AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET|AUDIO_DEVICE_IN_WIRED_HEADSET|AUDIO_DEVICE_IN_WIRED_HEADPHONE|AUDIO_DEVICE_IN_AUX_DIGITAL|AUDIO_DEVICE_IN_VOICE_CALL|AUDIO_DEVICE_IN_BACK_MIC|AUDIO_DEVICE_IN_THIRD_MIC|AUDIO_DEVICE_IN_FM
       }
     }
   }
diff --git a/audio/mixer_paths.xml b/audio/mixer_paths.xml
index a1178a0..cfbad56 100644
--- a/audio/mixer_paths.xml
+++ b/audio/mixer_paths.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
 <mixer>
-    <!-- Fortuna 3G EUR OPEN ================================================ -->
+    <!-- Grand Prime LTE US TMO(without external amp) ================================================ -->
     <!-- These are the initial mixer settings -->
     <!-- reset RX/TX Start -->
     <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia1" value="0" />
@@ -16,6 +16,16 @@
 
     <ctl name="PRI_MI2S_RX Port Mixer TERT_MI2S_TX" value="0" />
 
+    <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia1" value="0" />
+    <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia4" value="0" />
+    <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia5" value="0" />
+    <ctl name="QUAT_MI2S_RX_Voice Mixer Voice2" value="0" />
+    <ctl name="QUAT_MI2S_RX_Voice Mixer CSVoice" value="0" />
+    <ctl name="QUAT_MI2S_RX_Voice Mixer Voip" value="0" />
+    <ctl name="QUAT_MI2S_RX_Voice Mixer QCHAT" value="0" />
+    <ctl name="QUAT_MI2S_RX Port Mixer INTERNAL_FM_TX" value="0" />
+    <ctl name="QUAT_MI2S_RX_Voice Mixer VoWLAN" value="0" />
+
     <ctl name="AFE_PCM_RX_Voice Mixer Voice2" value="0" />
     <ctl name="AFE_PCM_RX Audio Mixer MultiMedia4" value="0" />
     <ctl name="AFE_PCM_RX_Voice Mixer VoWLAN" value="0" />
@@ -72,6 +82,7 @@
 
     <!-- reset TX part -->
     <ctl name="MultiMedia1 Mixer TERT_MI2S_TX" value="0" />
+    <ctl name="MultiMedia1 Mixer QUAT_MI2S_TX" value="0" />
     <ctl name="MultiMedia1 Mixer INTERNAL_BT_SCO_TX" value="0" />
     <ctl name="MultiMedia1 Mixer INTERNAL_FM_TX" value="0" />
     <ctl name="MultiMedia1 Mixer VOC_REC_UL" value="0" />
@@ -81,16 +92,22 @@
     <ctl name="Voice_Tx Mixer INTERNAL_BT_SCO_TX_Voice" value="0" />
     <ctl name="Voice_Tx Mixer PRI_MI2S_TX_Voice" value="0" />
 
+<ctl name="Voice_Tx Mixer TERT_MI2S_TX_Voice" value="0" />
+    <ctl name="Voice_Tx Mixer QUAT_MI2S_TX_Voice" value="0" />
+
     <ctl name="Voice2_Tx Mixer PRI_MI2S_TX_Voice2" value="0" />
+    <ctl name="Voice2_Tx Mixer QUAT_MI2S_TX_Voice2" value="0" />
     <ctl name="Voice2_Tx Mixer AFE_PCM_TX_Voice2" value="0" />
     <ctl name="Voice2_Tx Mixer INTERNAL_BT_SCO_TX_Voice2" value="0" />
-    <ctl name="Voice_Tx Mixer TERT_MI2S_TX_Voice" value="0" />
 
     <ctl name="Voip_Tx Mixer PRI_MI2S_TX_Voip" value="0" />
     <ctl name="Voip_Tx Mixer INTERNAL_BT_SCO_TX_Voip" value="0" />
     <ctl name="Voip_Tx Mixer TERT_MI2S_TX_Voip" value="0" />
 
+<ctl name="Voip_Tx Mixer QUAT_MI2S_TX_Voip" value="0" />
+
     <ctl name="VoWLAN_Tx Mixer TERT_MI2S_TX_VoWLAN" value="0" />
+    <ctl name="VoWLAN_Tx Mixer QUAT_MI2S_TX_VoWLAN" value="0" />
     <ctl name="VoWLAN_Tx Mixer INTERNAL_BT_SCO_TX_VoWLAN" value="0" />
     <ctl name="VoWLAN_Tx Mixer AFE_PCM_TX_VoWLAN" value="0" />
 
@@ -119,6 +136,8 @@
 
     <ctl name="MI2S_TX Channels" value="One" />
 
+<ctl name="VOC_EXT_EC MUX" value="NONE" />
+
     <ctl name="Internal BTSCO SampleRate" value="8000" />
 
     <ctl name="Voip Mode Config" value="12" />
@@ -128,7 +147,8 @@
     <ctl name="Voip Dtx Mode" value="0" />
 
     <ctl name="TTY Mode" value="Off" />
-
+    
+<ctl name="AUDIO_REF_EC_UL1 MUX" value="None" />
     <ctl name="MICBIAS CAPLESS Switch" value="0" />
 
     <!-- IIR -->
@@ -176,7 +196,7 @@
     <path name="deep-buffer-playback bt-sco">
         <ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia1" value="1" />
     </path>
-
+	
     <path name="deep-buffer-playback bt-sco-wb">
         <path name="deep-buffer-playback bt-sco" />
     </path>
@@ -198,6 +218,11 @@
         <ctl name="INTERNAL_FM_RX Audio Mixer MultiMedia1" value="1" />
     </path>
 
+    <path name="deep-buffer-playback speaker-and-bt-sco">
+        <path name="deep-buffer-playback bt-sco" />
+        <path name="deep-buffer-playback" />
+    </path>
+
     <!-- low latency -->
     <path name="low-latency-playback">
         <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia5" value="1" />
@@ -228,6 +253,11 @@
         <ctl name="INTERNAL_FM_RX Audio Mixer MultiMedia5" value="1" />
     </path>
 
+    <path name="low-latency-playback speaker-and-bt-sco">
+        <path name="low-latency-playback bt-sco" />
+        <path name="low-latency-playback" />
+    </path>
+
     <!-- tunnel -->
     <path name="compress-offload-playback">
         <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia4" value="1" />
@@ -553,12 +583,13 @@
     <!-- TX part -->
     <path name="main-mic">
         <ctl name="DEC1 MUX" value="ADC1" />
-        <ctl name="MICBIAS CAPLESS Switch" value="1" />
+		<ctl name="MICBIAS CAPLESS Switch" value="1" />
     </path>
 
     <path name="sub-mic">
         <ctl name="DEC1 MUX" value="ADC2" />
         <ctl name="ADC2 MUX" value="INP3" />
+    <ctl name="MICBIAS CAPLESS Switch" value="1" />
     </path>
 
     <path name="3rd-mic">
@@ -571,7 +602,7 @@
         <ctl name="DEC1 MUX" value="ADC2" />
         <ctl name="ADC2 MUX" value="INP2" />
         <ctl name="IIR1 INP1 MUX" value="DEC1" />
-        <ctl name="MICBIAS CAPLESS Switch" value="0" />
+		<ctl name="MICBIAS CAPLESS Switch" value="0" />
     </path>
 
     <path name="main-sub-mic">
@@ -583,6 +614,7 @@
         <ctl name="ADC1 Volume" value="4" />
         <ctl name="DEC2 Volume" value="82" />
         <ctl name="ADC3 Volume" value="4" />
+    <ctl name="MICBIAS CAPLESS Switch" value="1" />
     </path>
 
     <path name="sub-main-mic">
@@ -594,6 +626,7 @@
         <ctl name="ADC1 Volume" value="4" />
         <ctl name="DEC2 Volume" value="82" />
         <ctl name="ADC3 Volume" value="4" />
+    <ctl name="MICBIAS CAPLESS Switch" value="1" />
     </path>
 
     <path name="sub-3rd-mic">
@@ -635,8 +668,8 @@
 
     <path name="headset">
         <path name="ear" />
-        <ctl name="RX1 Digital Volume" value="81" />
-        <ctl name="RX2 Digital Volume" value="81" />
+        <ctl name="RX1 Digital Volume" value="82" />
+        <ctl name="RX2 Digital Volume" value="82" />
     </path>
 
     <path name="dock">
@@ -679,6 +712,11 @@
         <ctl name="EAR PA Gain" value="POS_1P5_DB" />	
     </path>
 
+    <path name="speaker-and-bt-sco">
+        <path name="spk" />
+        <ctl name="RX3 Digital Volume" value="84" />
+    </path>
+
     <path name="fm-speaker">
         <path name="spk" />
         <ctl name="RX3 Digital Volume" value="76" />
@@ -697,7 +735,7 @@
     <!-- Recording Scenario  -->
     <path name="rec-main-mic">
         <path name="main-mic" />
-        <ctl name="DEC1 Volume" value="89" />
+        <ctl name="DEC1 Volume" value="88" />
         <ctl name="ADC1 Volume" value="2" />
     </path>
 
@@ -714,7 +752,11 @@
     </path>
 
     <path name="rec-stereo-mic">
-        <path name="rec-main-mic" />
+       <path name="sub-main-mic" />
+        <ctl name="DEC1 Volume" value="98" />
+        <ctl name="ADC1 Volume" value="14" />
+        <ctl name="DEC2 Volume" value="85" />
+        <ctl name="ADC3 Volume" value="6" />
     </path>
 
     <path name="rec-high-gain-main-mic">
@@ -771,7 +813,7 @@
 
     <path name="vr-headset-mic">
         <path name="ear-mic" />
-        <ctl name="DEC1 Volume" value="88" />
+        <ctl name="DEC1 Volume" value="82" />
         <ctl name="ADC2 Volume" value="4" />
     </path>
 
@@ -869,12 +911,12 @@
 
     <path name="voice-call-speaker">
         <path name="spk" />
-        <ctl name="RX3 Digital Volume" value="82" />
+        <ctl name="RX3 Digital Volume" value="83" />
     </path>
 
     <path name="voice-call-speaker-extra-vol">
         <path name="spk" />
-        <ctl name="RX3 Digital Volume" value="82" />
+        <ctl name="RX3 Digital Volume" value="83" />
     </path>
 
     <path name="voice-call-speaker-emergency">
@@ -930,11 +972,19 @@
     </path>
 
     <path name="voice-call-NS-mic-handset">
-        <path name="voice-call-main-mic" />
+        <path name="main-sub-mic" />
+	<ctl name="DEC1 Volume" value="84" />
+	<ctl name="ADC1 Volume" value="4" />
+	<ctl name="DEC2 Volume" value="84" />
+	<ctl name="ADC3 Volume" value="4" />
     </path>
 
     <path name="voice-call-NS-mic-speaker">
-        <path name="voice-call-main-mic" />
+        <path name="sub-main-mic" />
+	<ctl name="DEC1 Volume" value="84" />
+	<ctl name="ADC1 Volume" value="4" />
+	<ctl name="DEC2 Volume" value="84" />
+	<ctl name="ADC3 Volume" value="4" />
     </path>
     <!-- end of Voice call Scenario  -->
 
@@ -1051,7 +1101,7 @@
     <!-- RX part -->
     <path name="video-call-handset">
         <path name="rcv" />
-        <ctl name="RX1 Digital Volume" value="81" />
+        <ctl name="RX1 Digital Volume" value="79" />
     </path>
 
     <path name="video-call-handset-extra-vol">
@@ -1060,7 +1110,7 @@
 
     <path name="video-call-speaker">
         <path name="spk" />
-        <ctl name="RX3 Digital Volume" value="82" />
+        <ctl name="RX3 Digital Volume" value="83" />
     </path>
 
     <path name="video-call-speaker-extra-vol">
@@ -1096,20 +1146,24 @@
 
     <path name="video-call-headset-mic">
         <path name="ear-mic" />
-        <ctl name="DEC1 Volume" value="84" />
+        <ctl name="DEC1 Volume" value="94" />
         <ctl name="ADC2 Volume" value="4" />
     </path>
 
     <path name="video-call-NS-mic-handset">
-        <path name="main-mic" />
-        <ctl name="DEC1 Volume" value="84" />
-        <ctl name="ADC1 Volume" value="4" />
+        <path name="main-sub-mic" />
+	<ctl name="DEC1 Volume" value="84" />
+	<ctl name="ADC1 Volume" value="4" />
+	<ctl name="DEC2 Volume" value="84" />
+	<ctl name="ADC3 Volume" value="4" />
     </path>
 
     <path name="video-call-NS-mic-speaker">
-        <path name="main-mic" />
-        <ctl name="DEC1 Volume" value="84" />
-        <ctl name="ADC1 Volume" value="4" />
+        <path name="sub-main-mic" />
+	<ctl name="DEC1 Volume" value="84" />
+	<ctl name="ADC1 Volume" value="4" />
+	<ctl name="DEC2 Volume" value="84" />
+	<ctl name="ADC3 Volume" value="4" />
     </path>
     <!-- end of Video call Scenario  -->
 
@@ -1118,12 +1172,12 @@
     <!-- RX part -->
     <path name="VoLTE-voice-handset">
         <path name="rcv" />
-        <ctl name="RX1 Digital Volume" value="81" />
+        <ctl name="RX1 Digital Volume" value="79" />
     </path>
 
     <path name="VoLTE-voice-handset-extra-vol">
         <path name="rcv" />
-        <ctl name="RX1 Digital Volume" value="81" />
+        <ctl name="RX1 Digital Volume" value="79" />
     </path>
 
     <path name="VoLTE-voice-handset-hac">
@@ -1133,12 +1187,12 @@
 
     <path name="VoLTE-voice-speaker">
         <path name="spk" />
-        <ctl name="RX3 Digital Volume" value="80" />
+        <ctl name="RX3 Digital Volume" value="83" />
     </path>
 
     <path name="VoLTE-voice-speaker-extra-vol">
         <path name="spk" />
-        <ctl name="RX3 Digital Volume" value="80" />
+        <ctl name="RX3 Digital Volume" value="83" />
     </path>
 
     <path name="VoLTE-voice-headset">
@@ -1172,20 +1226,24 @@
 
     <path name="VoLTE-voice-headset-mic">
         <path name="ear-mic" />
-        <ctl name="DEC1 Volume" value="84" />
+        <ctl name="DEC1 Volume" value="94" />
         <ctl name="ADC2 Volume" value="4" />
     </path>
 
     <path name="VoLTE-voice-NS-mic-handset">
-        <path name="main-mic" />
-        <ctl name="DEC1 Volume" value="84" />
-        <ctl name="ADC1 Volume" value="4" />
+        <path name="main-sub-mic" />
+	<ctl name="DEC1 Volume" value="84" />
+	<ctl name="ADC1 Volume" value="4" />
+	<ctl name="DEC2 Volume" value="84" />
+	<ctl name="ADC3 Volume" value="4" />
     </path>
 
     <path name="VoLTE-voice-NS-mic-speaker">
-        <path name="main-mic" />
-        <ctl name="DEC1 Volume" value="84" />
-        <ctl name="ADC1 Volume" value="4" />
+        <path name="sub-main-mic" />
+	<ctl name="DEC1 Volume" value="84" />
+	<ctl name="ADC1 Volume" value="4" />
+	<ctl name="DEC2 Volume" value="84" />
+	<ctl name="ADC3 Volume" value="4" />
     </path>
     <!-- end of VoLTE Voice call Scenario  -->
 
@@ -1248,15 +1306,19 @@
     </path>
 
     <path name="VoLTE-video-NS-mic-handset">
-        <path name="main-mic" />
-        <ctl name="DEC1 Volume" value="84" />
-        <ctl name="ADC1 Volume" value="4" />
+        <path name="main-sub-mic" />
+	<ctl name="DEC1 Volume" value="84" />
+	<ctl name="ADC1 Volume" value="4" />
+	<ctl name="DEC2 Volume" value="84" />
+	<ctl name="ADC3 Volume" value="4" />
     </path>
 
     <path name="VoLTE-video-NS-mic-speaker">
-        <path name="main-mic" />
-        <ctl name="DEC1 Volume" value="84" />
-        <ctl name="ADC1 Volume" value="4" />
+        <path name="sub-main-mic" />
+	<ctl name="DEC1 Volume" value="84" />
+	<ctl name="ADC1 Volume" value="4" />
+	<ctl name="DEC2 Volume" value="84" />
+	<ctl name="ADC3 Volume" value="4" />
     </path>
     <!-- end of VoLTE Video call Scenario  -->
 
@@ -1292,18 +1354,21 @@
         <path name="main-mic" />
         <ctl name="DEC1 Volume" value="84" />
         <ctl name="ADC1 Volume" value="4" />
+        <ctl name="TTY Mode" value="VCO" />
     </path>
 
     <path name="TTY-headset-mic">
         <path name="ear-mic" />
         <ctl name="DEC1 Volume" value="84" />
         <ctl name="ADC2 Volume" value="4" />
+        <ctl name="TTY Mode" value="HCO" />
     </path>
 
     <path name="TTY-full-mic">
         <path name="ear-mic" />
         <ctl name="DEC1 Volume" value="84" />
         <ctl name="ADC2 Volume" value="4" />
+        <ctl name="TTY Mode" value="FULL" />
     </path>
     <!-- end of TTY Scenario -->
 
@@ -1317,7 +1382,7 @@
 
     <path name="voip-speaker-comm">
         <path name="spk" />
-        <ctl name="RX3 Digital Volume" value="80" />
+        <ctl name="RX3 Digital Volume" value="82" />
     </path>
 
     <path name="voip-headset-comm">
@@ -1400,11 +1465,21 @@
         <ctl name="RX1 Digital Volume" value="81" />
     </path>
 
+    <path name="voip-handset-carrier-extra-vol">
+        <path name="rcv" />
+        <ctl name="RX1 Digital Volume" value="81" />
+    </path>
+
     <path name="voip-speaker-carrier">
         <path name="spk" />
         <ctl name="RX3 Digital Volume" value="80" />
     </path>
 
+    <path name="voip-speaker-carrier-extra-vol">
+        <path name="spk" />
+        <ctl name="RX3 Digital Volume" value="80" />
+    </path>
+
     <path name="voip-headset-carrier">
         <path name="ear" />
         <ctl name="RX1 Digital Volume" value="86" />
@@ -1445,13 +1520,13 @@
     <path name="voip-headphone-mic-comm">
         <path name="main-mic" />
         <ctl name="DEC1 Volume" value="84" />
-        <ctl name="ADC1 Volume" value="4" />
+        <ctl name="ADC1 Volume" value="14" />
     </path>
 
     <path name="voip-headset-mic-comm">
         <path name="ear-mic" />
         <ctl name="DEC1 Volume" value="84" />
-        <ctl name="ADC2 Volume" value="4" />
+        <ctl name="ADC2 Volume" value="14" />
     </path>
 
     <path name="voip-main-mic-others">
@@ -1549,9 +1624,11 @@
     </path>
 
     <path name="voip-main-mic-carrier">
-        <path name="main-mic" />
+        <path name="main-sub-mic" />
         <ctl name="DEC1 Volume" value="84" />
         <ctl name="ADC1 Volume" value="4" />
+        <ctl name="DEC2 Volume" value="84" />
+        <ctl name="ADC3 Volume" value="4" />
     </path>
 
     <path name="voip-sub-mic-carrier">
@@ -1658,7 +1735,9 @@
     </path>
 
     <path name="loopback-sub-mic-DSP">
-        <path name="loopback-main-mic-DSP" />
+        <path name="sub-mic" />
+        <ctl name="ADC3 Volume" value="4" />
+        <ctl name="DEC1 Volume" value="69" />
     </path>
 
     <path name="loopback-3rd-mic-DSP">
@@ -1772,7 +1851,7 @@
     </path>
 
     <path name="loopback-cp2-sub-mic-DSP">
-        <path name="loopback-main-mic-DSP" />
+        <path name="loopback-sub-mic-DSP" />
     </path>
 
     <path name="loopback-cp2-3rd-mic-DSP">