j5: Reconfigure tree for j53gxx

* Update configs from J500HXXU1APE5
* Change Makefile guards
* Update device name
* Update system props

 This is the commit message #2:

j5: Remove local manifests

 This is the commit message #3:

j5: Update overlays

* Remove power overlay (already in j5-common)
* Update network capabilities
diff --git a/Android.mk b/Android.mk
index dff8b1b..9e0c26b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,4 +1,4 @@
-ifeq ($(TARGET_DEVICE),gprimelte)
+ifeq ($(TARGET_DEVICE),j53gxx)
 LOCAL_PATH := $(call my-dir)
 include $(call all-subdir-makefiles,$(LOCAL_PATH))
 include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/BoardConfig.mk b/BoardConfig.mk
index d0cff19..4a50f5a 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -1,18 +1,15 @@
 # Inherit from common
-include device/samsung/gprimelte-common/BoardConfigCommon.mk
+include device/samsung/j5-common/BoardConfigCommon.mk
 
-LOCAL_PATH := device/samsung/gprimelte
+LOCAL_PATH := device/samsung/j53gxx
 
 # Asserts
-TARGET_OTA_ASSERT_DEVICE := gprimelte,gprimeltecan,gprimeltetmo,gprimeltemtr,gprimeltespr
-
-# Init
-TARGET_UNIFIED_DEVICE := true
+TARGET_OTA_ASSERT_DEVICE := j53gxx,j53g
 
 # Kernel
-TARGET_KERNEL_VARIANT_CONFIG := msm8916_sec_fortuna_can_defconfig
+TARGET_KERNEL_VARIANT_CONFIG := msm8916_sec_j53g_eur_defconfig
 
 # Partition sizes
-BOARD_SYSTEMIMAGE_PARTITION_SIZE    := 2233466880
+BOARD_SYSTEMIMAGE_PARTITION_SIZE    := 2097152000
 BOARD_SYSTEMIMAGE_PARTITION_TPE    := ext4
-BOARD_USERDATAIMAGE_PARTITION_SIZE  := 4942966784
+BOARD_USERDATAIMAGE_PARTITION_SIZE  := 5079281664
diff --git a/README.md b/README.md
index 1eb3cb4..fce0081 100644
--- a/README.md
+++ b/README.md
@@ -1,18 +1,18 @@
-# android_device_samsung_gprimelte
+# android_device_samsung_j53gxx
 
-## Unified device tree for Samsung Galaxy Grand Prime [G530P/T/T1/W]
+## Device tree for Samsung J5 3G
 
 Basic   | Spec Sheet
 -------:|:-------------------------
-CPU     | Qualcomm MSM8916 Quad-core 1.2 GHz ARM® Cortex™ A53
+CPU     | Qualcomm MSM8916/MSM8216 Quad-core 1.2 GHz ARM® Cortex™ A53
 CHIPSET | Qualcomm MSM8916 Snapdragon 410
 GPU     | Adreno 306
-Memory  | 1.5 GB
-Shipped Android Version | 5.1.1
+Memory  | 1.5 GB / 1 GB
+Shipped Android Version | 5.0.2/5.1.1
 Storage | 8 GB
 MicroSD | Up to 64 GB
 Battery | 2600 mAh (removable)
 Dimensions | 144.8 x 72.1 x 8.6 mm
-Display | 540 x 960 (qHD), 5.0" (126.4mm)
-Rear Camera  | 8.0 MP, LED flash, S.LSI. S5K4H5YB
+Display | 720 x 1280 (qHD), 5.6" (142.1mm)
+Rear Camera  | 8.0 MP, LED flash, S.LSI. S5K4H5YB/IMX219
 Front Camera | 5.0 MP, S.LSI. S5K5E3YX
diff --git a/audio/base/mixer_paths.xml b/audio/base/mixer_paths.xml
deleted file mode 100644
index cfbad56..0000000
--- a/audio/base/mixer_paths.xml
+++ /dev/null
@@ -1,1911 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<mixer>
-    <!-- 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" />
-    <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia4" value="0" />
-    <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia5" value="0" />
-    <ctl name="PRI_MI2S_RX_Voice Mixer Voice2" value="0" />
-    <ctl name="PRI_MI2S_RX_Voice Mixer CSVoice" value="0" />
-    <ctl name="PRI_MI2S_RX_Voice Mixer Voip" value="0" />
-    <ctl name="PRI_MI2S_RX_Voice Mixer QCHAT" value="0" />
-    <ctl name="PRI_MI2S_RX Port Mixer INTERNAL_FM_TX" value="0" />
-    <ctl name="PRI_MI2S_RX_Voice Mixer VoWLAN" value="0" />
-
-    <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" />
-
-    <ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia1" value="0" />
-    <ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia4" value="0" />
-    <ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia5" value="0" />
-    <ctl name="INTERNAL_BT_SCO_RX_Voice Mixer CSVoice" value="0" />
-    <ctl name="INTERNAL_BT_SCO_RX_Voice Mixer Voice2" value="0" />
-    <ctl name="INTERNAL_BT_SCO_RX_Voice Mixer QCHAT" value="0" />
-    <ctl name="INTERNAL_BT_SCO_RX_Voice Mixer Voip" value="0" />
-    <ctl name="INTERNAL_BT_SCO_RX_Voice Mixer VoWLAN" value="0" />
-
-    <ctl name="INTERNAL_FM_RX Audio Mixer MultiMedia1" value="0" />
-    <ctl name="INTERNAL_FM_RX Audio Mixer MultiMedia4" value="0" />
-    <ctl name="INTERNAL_FM_RX Audio Mixer MultiMedia5" value="0" />
-
-    <ctl name="Incall_Music Audio Mixer MultiMedia2" value="0" />
-    <ctl name="Incall_Music_2 Audio Mixer MultiMedia9" value="0" />
-
-    <ctl name="RX2 MIX2 INP2" value="ZERO" />
-    <ctl name="RX2 MIX2 INP1" value="ZERO" />
-    <ctl name="RX1 MIX2 INP2" value="ZERO" />
-    <ctl name="RX1 MIX2 INP1" value="ZERO" />
-    <ctl name="RX3 MIX1 INP2" value="ZERO" />
-    <ctl name="RX3 MIX1 INP1" value="ZERO" />
-    <ctl name="RX2 MIX1 INP2" value="ZERO" />
-    <ctl name="RX2 MIX1 INP1" value="ZERO" />
-    <ctl name="RX1 MIX1 INP2" value="ZERO" />
-    <ctl name="RX1 MIX1 INP1" value="ZERO" />
-
-    <ctl name="RX1 Digital Volume" value="84" />
-    <ctl name="RX2 Digital Volume" value="84" />
-    <ctl name="RX3 Digital Volume" value="84" />
-
-    <ctl name="Voice Rx Device Mute" id="0" value="0" />
-    <ctl name="Voice Rx Device Mute" id="1" value="-1" />
-    <ctl name="Voice Rx Device Mute" id="2" value="20" />
-    <ctl name="Voice Rx Gain" id="0" value="0" />
-    <ctl name="Voice Rx Gain" id="1" value="-1" />
-    <ctl name="Voice Rx Gain" id="2" value="20" />
-    <ctl name="Voip Rx Gain" id="0" value="0" />
-    <ctl name="Voip Rx Gain" id="1" value="20" />
-
-    <ctl name="Internal FM RX Volume" value="0" />
-    <ctl name="EAR PA Gain" value="POS_6_DB" />
-    <ctl name="SPK DAC Switch" value="0" />
-    <ctl name="EAR_S" value="ZERO" />
-    <ctl name="HPHL" value="ZERO" />
-    <ctl name="HPHR" value="ZERO" />
-    <ctl name="MI2S_RX Channels" value="One" />
-
-    <ctl name="HDMI_RX_Voice Mixer VoWLAN" value="0" />
-
-    <!-- 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" />
-    <ctl name="MultiMedia1 Mixer VOC_REC_DL" value="0" />
-    <ctl name="MultiMedia2 Mixer INTERNAL_FM_TX" value="0" />
-
-    <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="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" />
-
-    <ctl name="QCHAT_Tx Mixer PRI_MI2S_TX_QCHAT" value="0" />
-    <ctl name="QCHAT_Tx Mixer INTERNAL_BT_SCO_TX_QCHAT" value="0" />
-    <ctl name="QCHAT_Tx Mixer TERT_MI2S_TX_QCHAT" value="0" />
-
-    <ctl name="Voice Tx Mute" id="0" value="0" />
-    <ctl name="Voice Tx Mute" id="1" value="-1" />
-    <ctl name="Voice Tx Mute" id="2" value="500" />
-    <ctl name="Voip Tx Mute" id="0" value="0" />
-    <ctl name="Voip Tx Mute" id="1" value="500" />
-
-    <ctl name="IIR1 INP1 Volume" value="84" />
-    <ctl name="IIR1 INP2 Volume" value="84" />
-    <ctl name="IIR1 INP3 Volume" value="84" />
-    <ctl name="IIR1 INP4 Volume" value="84" />
-    <ctl name="ADC1 Volume" value="13" />
-    <ctl name="ADC2 Volume" value="13" />
-    <ctl name="DEC1 Volume" value="84" />
-    <ctl name="DEC2 Volume" value="84" />
-
-    <ctl name="DEC2 MUX" value="ZERO" />
-    <ctl name="DEC1 MUX" value="ZERO" />
-    <ctl name="ADC2 MUX" value="ZERO" />
-
-    <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" />
-    <ctl name="Voip Rate Config" value="0" />
-    <ctl name="Voip Evrc Min Max Rate Config" id="0" value="1" />
-    <ctl name="Voip Evrc Min Max Rate Config" id="1" value="4" />
-    <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 -->
-    <ctl name="IIR1 Band1" id ="0" value="268435456" />
-    <ctl name="IIR1 Band1" id ="1" value="0" />
-    <ctl name="IIR1 Band1" id ="2" value="0" />
-    <ctl name="IIR1 Band1" id ="3" value="0" />
-    <ctl name="IIR1 Band1" id ="4" value="0" />
-    <ctl name="IIR1 Band2" id ="0" value="268435456" />
-    <ctl name="IIR1 Band2" id ="1" value="0" />
-    <ctl name="IIR1 Band2" id ="2" value="0" />
-    <ctl name="IIR1 Band2" id ="3" value="0" />
-    <ctl name="IIR1 Band2" id ="4" value="0" />
-    <ctl name="IIR1 Band3" id ="0" value="268435456" />
-    <ctl name="IIR1 Band3" id ="1" value="0" />
-    <ctl name="IIR1 Band3" id ="2" value="0" />
-    <ctl name="IIR1 Band3" id ="3" value="0" />
-    <ctl name="IIR1 Band3" id ="4" value="0" />
-    <ctl name="IIR1 Band4" id ="0" value="268435456" />
-    <ctl name="IIR1 Band4" id ="1" value="0" />
-    <ctl name="IIR1 Band4" id ="2" value="0" />
-    <ctl name="IIR1 Band4" id ="3" value="0" />
-    <ctl name="IIR1 Band4" id ="4" value="0" />
-    <ctl name="IIR1 Band5" id ="0" value="268435456" />
-    <ctl name="IIR1 Band5" id ="1" value="0" />
-    <ctl name="IIR1 Band5" id ="2" value="0" />
-    <ctl name="IIR1 Band5" id ="3" value="0" />
-    <ctl name="IIR1 Band5" id ="4" value="0" />
-    <ctl name="IIR1 Enable Band1" value="0" />
-    <ctl name="IIR1 Enable Band2" value="0" />
-    <ctl name="IIR1 Enable Band3" value="0" />
-    <ctl name="IIR1 Enable Band4" value="0" />
-    <ctl name="IIR1 Enable Band5" value="0" />
-    <!-- IIR -->
-    <!-- reset RX/TX End -->
-
-    <!-- ================================================================ -->
-    <!-- Verb -->
-    <!-- RX part -->
-    <!-- hifi -->
-    <path name="deep-buffer-playback">
-        <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia1" value="1" />
-    </path>
-
-    <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>
-
-    <path name="deep-buffer-playback afe-proxy">
-        <ctl name="AFE_PCM_RX Audio Mixer MultiMedia1" value="1" />
-    </path>
-
-    <path name="deep-buffer-playback usb-headphones">
-        <path name="deep-buffer-playback afe-proxy" />
-    </path>
-
-    <path name="deep-buffer-playback speaker-and-usb-headphones">
-        <path name="deep-buffer-playback usb-headphones" />
-        <path name="deep-buffer-playback" />
-    </path>
-
-    <path name="deep-buffer-playback transmission-fm">
-        <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" />
-    </path>
-
-    <path name="low-latency-playback bt-sco">
-        <ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia5" value="1" />
-    </path>
-
-    <path name="low-latency-playback bt-sco-wb">
-        <path name="low-latency-playback bt-sco" />
-    </path>
-
-    <path name="low-latency-playback afe-proxy">
-        <ctl name="AFE_PCM_RX Audio Mixer MultiMedia5" value="1" />
-    </path>
-
-    <path name="low-latency-playback usb-headphones">
-        <path name="low-latency-playback afe-proxy" />
-    </path>
-
-    <path name="low-latency-playback speaker-and-usb-headphones">
-        <path name="low-latency-playback usb-headphones" />
-        <path name="low-latency-playback" />
-    </path>
-
-    <path name="low-latency-playback transmission-fm">
-        <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" />
-    </path>
-
-    <path name="compress-offload-playback bt-sco">
-        <ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia4" value="1" />
-    </path>
-
-    <path name="compress-offload-playback bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
-        <path name="compress-offload-playback bt-sco" />
-    </path>
-
-    <path name="compress-offload-playback afe-proxy">
-        <ctl name="AFE_PCM_RX Audio Mixer MultiMedia4" value="1" />
-    </path>
-
-    <path name="compress-offload-playback usb-headphones">
-        <path name="compress-offload-playback afe-proxy" />
-    </path>
-
-    <path name="compress-offload-playback speaker-and-usb-headphones">
-        <path name="compress-offload-playback usb-headphones" />
-        <path name="compress-offload-playback" />
-    </path>
-
-    <path name="compress-offload-playback transmission-fm">
-        <ctl name="INTERNAL_FM_RX Audio Mixer MultiMedia4" value="1" />
-    </path>
-
-    <!-- TX part -->
-    <path name="audio-record">
-        <ctl name="MultiMedia1 Mixer TERT_MI2S_TX" value="1" />
-    </path>
-
-    <path name="audio-record bt-sco">
-        <ctl name="MultiMedia1 Mixer INTERNAL_BT_SCO_TX" value="1" />
-    </path>
-
-    <path name="audio-record bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
-        <path name="audio-record bt-sco" />
-    </path>
-
-    <path name="audio-record usb-headset-mic">
-        <ctl name="MultiMedia1 Mixer AFE_PCM_TX" value="1" />
-    </path>
-
-    <path name="audio-record capture-fm">
-        <ctl name="MultiMedia1 Mixer INTERNAL_FM_TX" value="1" />
-    </path>
-
-    <path name="fm-virtual-record capture-fm">
-        <ctl name="MultiMedia2 Mixer INTERNAL_FM_TX" value="1" />
-    </path>
-
-    <!-- call part -->
-    <path name="voice-call">
-        <ctl name="PRI_MI2S_RX_Voice Mixer CSVoice" value="1" />
-        <ctl name="Voice_Tx Mixer TERT_MI2S_TX_Voice" value="1" />
-    </path>
-
-    <path name="voice-call bt-sco">
-        <ctl name="INTERNAL_BT_SCO_RX_Voice Mixer CSVoice" value="1" />
-        <ctl name="Voice_Tx Mixer INTERNAL_BT_SCO_TX_Voice" value="1" />
-    </path>
-
-    <path name="voice-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
-        <path name="voice-call bt-sco" />
-    </path>
-
-    <path name="voice-call usb-headphones">
-        <ctl name="AFE_PCM_RX_Voice Mixer CSVoice" value="1" />
-        <ctl name="Voice_Tx Mixer AFE_PCM_TX_Voice" value="1" />
-    </path>
-
-    <path name="voice-call-cp2">
-        <ctl name="PRI_MI2S_RX_Voice Mixer Voice2" value="1" />
-        <ctl name="Voice2_Tx Mixer TERT_MI2S_TX_Voice2" value="1" />
-    </path>
-
-    <path name="voice-call-cp2 bt-sco">
-        <ctl name="INTERNAL_BT_SCO_RX_Voice Mixer Voice2" value="1" />
-        <ctl name="Voice2_Tx Mixer INTERNAL_BT_SCO_TX_Voice2" value="1" />
-    </path>
-
-    <path name="play-fm">
-        <ctl name="Internal FM RX Volume" value="1" />
-        <ctl name="PRI_MI2S_RX Port Mixer INTERNAL_FM_TX" value="1" />
-    </path>
-
-    <path name="fm-input">
-        <path name="audio-record capture-fm" />
-    </path>
-
-    <path name="vowlan-call">
-        <ctl name="PRI_MI2S_RX_Voice Mixer VoWLAN" value="1" />
-        <ctl name="VoWLAN_Tx Mixer TERT_MI2S_TX_VoWLAN" value="1" />
-    </path>
-
-    <path name="vowlan-call hdmi">
-        <ctl name="HDMI_RX_Voice Mixer VoWLAN" value="1" />
-        <ctl name="VoWLAN_Tx Mixer TERT_MI2S_TX_VoWLAN" value="1" />
-    </path>
-
-    <path name="vowlan-call bt-sco">
-        <ctl name="INTERNAL_BT_SCO_RX_Voice Mixer VoWLAN" value="1" />
-        <ctl name="VoWLAN_Tx Mixer INTERNAL_BT_SCO_TX_VoWLAN" value="1" />
-    </path>
-
-    <path name="vowlan-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
-        <path name="vowlan-call bt-sco" />
-    </path>
-
-    <path name="vowlan-call usb-headphones">
-        <ctl name="AFE_PCM_RX_Voice Mixer VoWLAN" value="1" />
-        <ctl name="VoWLAN_Tx Mixer AFE_PCM_TX_VoWLAN" value="1" />
-    </path>
-
-    <path name="hfp-sco">
-        <ctl name="PRI_MI2S_RX Port Mixer INTERNAL_BT_SCO_TX" value="1" />
-        <ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia6" value="1" />
-        <ctl name="MultiMedia6 Mixer TERT_MI2S_TX" value="1" />
-    </path>
-
-    <path name="hfp-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
-        <path name="hfp-sco" />
-    </path>	
-
-    <path name="incall-rec-uplink">
-        <ctl name="MultiMedia1 Mixer VOC_REC_UL" value="1" />
-    </path>
-
-    <path name="incall-rec-uplink bt-sco">
-        <path name="incall-rec-uplink" />
-    </path>
-
-    <path name="incall-rec-uplink bt-sco-wb">
-        <path name="incall-rec-uplink" />
-    </path>
-
-    <path name="incall-rec-downlink">
-        <ctl name="MultiMedia1 Mixer VOC_REC_DL" value="1" />
-    </path>
-
-    <path name="incall-rec-downlink bt-sco">
-        <path name="incall-rec-downlink" />
-    </path>
-
-    <path name="incall-rec-downlink bt-sco-wb">
-        <path name="incall-rec-downlink" />
-    </path>
-
-    <path name="incall-rec-uplink-and-downlink">
-        <path name="incall-rec-uplink" />
-        <path name="incall-rec-downlink" />
-    </path>
-
-    <path name="incall-rec-uplink-and-downlink bt-sco">
-        <path name="incall-rec-uplink-and-downlink" />
-    </path>
-
-    <path name="incall-rec-uplink-and-downlink bt-sco-wb">
-        <path name="incall-rec-uplink-and-downlink" />
-    </path>
-
-    <path name="incall_music_uplink">
-       <ctl name="Incall_Music Audio Mixer MultiMedia2" value="1" />
-    </path>
-
-    <path name="incall_music_uplink2">
-        <ctl name="Incall_Music_2 Audio Mixer MultiMedia9" value="1" />
-    </path>
-
-    <path name="incall-rec-uplink-cp2">
-        <ctl name="MultiMedia1 Mixer VOC_REC_UL" value="1" />
-    </path>
-
-    <path name="incall-rec-downlink-cp2">
-        <ctl name="MultiMedia1 Mixer VOC_REC_DL" value="1" />
-    </path>  
-
-    <path name="incall-rec-uplink-and-downlink-cp2">
-        <path name="incall-rec-uplink-cp2" />
-        <path name="incall-rec-downlink-cp2" />
-    </path>    
-
-    <path name="incall-rec-uplink-and-downlink-cp2 bt-sco">
-        <path name="incall-rec-uplink-cp2" />
-        <path name="incall-rec-downlink-cp2" />
-    </path>
-    
-    <path name="voip-call">
-        <ctl name="PRI_MI2S_RX_Voice Mixer Voip" value="1" />
-        <ctl name="Voip_Tx Mixer TERT_MI2S_TX_Voip" value="1" />
-    </path>
-
-    <path name="voip-call bt-sco">
-        <ctl name="INTERNAL_BT_SCO_RX_Voice Mixer Voip" value="1" />
-        <ctl name="Voip_Tx Mixer INTERNAL_BT_SCO_TX_Voip" value="1" />
-    </path>
-
-    <path name="volte-call">
-        <ctl name="PRI_MI2S_RX_Voice Mixer VoLTE" value="1" />
-        <ctl name="VoLTE_Tx Mixer TERT_MI2S_TX_VoLTE" value="1" />
-   </path>
-
-   <path name="volte-call hdmi">
-       <ctl name="HDMI_RX_Voice Mixer VoLTE" value="1" />
-       <ctl name="VoLTE_Tx Mixer SLIM_0_TX_VoLTE" value="1" />
-   </path>
-
-   <path name="volte-call bt-sco">
-        <ctl name="INTERNAL_BT_SCO_RX_Voice Mixer VoLTE" value="1" />
-        <ctl name="VoLTE_Tx Mixer INTERNAL_BT_SCO_TX_VoLTE" value="1" />
-    </path>
-
-   <path name="volte-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
-        <path name="volte-call bt-sco" />
-    </path>
-
-   <path name="volte-call usb-headphones">
-        <ctl name="AFE_PCM_RX_Voice Mixer VoLTE" value="1" />
-        <ctl name="VoLTE_Tx Mixer AFE_PCM_TX_VoLTE" value="1" />
-   </path>
-
-    <path name="compress-voip-call">
-        <ctl name="PRI_MI2S_RX_Voice Mixer Voip" value="1" />
-        <ctl name="Voip_Tx Mixer TERT_MI2S_TX_Voip" value="1" />
-    </path>
-
-    <path name="compress-voip-call bt-sco">
-        <ctl name="INTERNAL_BT_SCO_RX_Voice Mixer Voip" value="1" />
-        <ctl name="Voip_Tx Mixer INTERNAL_BT_SCO_TX_Voip" value="1" />
-    </path>
-
-    <path name="compress-voip-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
-        <path name="compress-voip-call bt-sco" />
-    </path>
-
-    <path name="qchat-call">
-        <ctl name="PRI_MI2S_RX_Voice Mixer QCHAT" value="1" />
-        <ctl name="QCHAT_Tx Mixer TERT_MI2S_TX_QCHAT" value="1" />
-    </path>
-
-    <path name="qchat-call bt-sco">
-        <ctl name="INTERNAL_BT_SCO_RX_Voice Mixer QCHAT" value="1" />
-        <ctl name="QCHAT_Tx Mixer INTERNAL_BT_SCO_TX_QCHAT" value="1" />
-    </path>
-
-    <path name="qchat-call bt-sco-wb">
-        <ctl name="Internal BTSCO SampleRate" value="16000" />
-        <path name="qchat-call bt-sco" />
-    </path>
-    <!-- end of Verb -->
-
-    <!-- ================================================================ -->
-    <!-- Device -->
-    <!-- RX part -->
-
-    <path name="rcv">
-        <ctl name="RX1 MIX1 INP1" value="RX1" />
-        <ctl name="RDAC2 MUX" value="RX1" />
-        <ctl name="EAR_S" value="Switch" />
-    </path>
-
-    <path name="spk">
-        <ctl name="MI2S_RX Channels" value="Two" />
-        <ctl name="RX3 MIX1 INP1" value="RX1" />
-        <ctl name="RX3 MIX1 INP2" value="RX2" />
-        <ctl name="SPK DAC Switch" value="1" />
-	<ctl name="Speaker Boost" value="ENABLE" />
-    </path>
-
-    <path name="ear">
-        <ctl name="MI2S_RX Channels" value="Two" />
-        <ctl name="RX1 MIX1 INP1" value="RX1" />
-        <ctl name="RX2 MIX1 INP1" value="RX2" />
-        <ctl name="RDAC2 MUX" value="RX2" />
-        <ctl name="HPHL" value="Switch" />
-        <ctl name="HPHR" value="Switch" />
-    </path>
-
-    <path name="lineout">
-        <ctl name="MI2S_RX Channels" value="Two" />
-        <ctl name="RX1 MIX1 INP1" value="RX1" />
-        <ctl name="RX2 MIX1 INP1" value="RX2" />
-        <ctl name="RDAC2 MUX" value="RX2" />
-        <ctl name="HPHL" value="Switch" />
-        <ctl name="HPHR" value="Switch" />
-    </path>
-
-    <path name="spk-lineout">
-        <ctl name="MI2S_RX Channels" value="Two" />
-        <ctl name="RX1 MIX1 INP1" value="RX1" />
-        <ctl name="RX2 MIX1 INP1" value="RX2" />
-        <ctl name="RX3 MIX1 INP1" value="RX1" />
-	<ctl name="RX3 MIX1 INP2" value="RX2" />
-        <ctl name="RDAC2 MUX" value="RX2" />
-        <ctl name="SPK DAC Switch" value="1" />
-        <ctl name="HPHL" value="Switch" />
-        <ctl name="HPHR" value="Switch" />
-    </path>
-
-    <path name="spk-ear">
-        <ctl name="MI2S_RX Channels" value="Two" />
-        <ctl name="RX1 MIX1 INP1" value="RX1" />
-        <ctl name="RX2 MIX1 INP1" value="RX2" />
-        <ctl name="RX3 MIX1 INP1" value="RX1" />
-	<ctl name="RX3 MIX1 INP2" value="RX2" />
-        <ctl name="RDAC2 MUX" value="RX2" />
-        <ctl name="SPK DAC Switch" value="1" />
-        <ctl name="HPHL" value="Switch" />
-        <ctl name="HPHR" value="Switch" />
-    </path>
-
-    <!-- TX part -->
-    <path name="main-mic">
-        <ctl name="DEC1 MUX" value="ADC1" />
-		<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">
-        <path name="main-mic" />
-        <ctl name="DEC1 Volume" value="68" />
-        <ctl name="ADC1 Volume" value="68" />
-    </path>
-
-    <path name="ear-mic">
-        <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" />
-    </path>
-
-    <path name="main-sub-mic">
-        <ctl name="MI2S_TX Channels" value="Two" />
-        <ctl name="DEC1 MUX" value="ADC1" />
-        <ctl name="DEC2 MUX" value="ADC2" />
-        <ctl name="ADC2 MUX" value="INP3" />
-        <ctl name="DEC1 Volume" value="68" />
-        <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">
-        <ctl name="MI2S_TX Channels" value="Two" />
-        <ctl name="DEC1 MUX" value="ADC1" />
-        <ctl name="DEC2 MUX" value="ADC2" />
-        <ctl name="ADC2 MUX" value="INP3" />
-        <ctl name="DEC1 Volume" value="68" />
-        <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">
-        <path name="main-mic" />
-        <ctl name="DEC1 Volume" value="68" />
-        <ctl name="ADC1 Volume" value="68" />
-    </path>
-
-    <path name="main-3rd-mic">
-        <path name="main-mic" />
-        <ctl name="DEC1 Volume" value="68" />
-        <ctl name="ADC1 Volume" value="68" />
-    </path>
-
-    <path name="main-sub-3rd-mic">
-        <path name="main-mic" />
-        <ctl name="DEC1 Volume" value="68" />
-        <ctl name="ADC1 Volume" value="68" />
-    </path>
-
-    <path name="3rd-sub-main-mic">
-        <path name="main-mic" />
-        <ctl name="DEC1 Volume" value="68" />
-        <ctl name="ADC1 Volume" value="68" />
-    </path>
-    <!-- end of Device -->
-
-    <!-- ================================================================ -->
-    <!-- Play Scenario  -->
-    <path name="handset">
-        <path name="rcv" />
-        <ctl name="RX1 Digital Volume" value="84" />
-    </path>
-
-    <path name="speaker">
-        <path name="spk" />
-        <ctl name="RX3 Digital Volume" value="80" />
-    </path>
-
-    <path name="headset">
-        <path name="ear" />
-        <ctl name="RX1 Digital Volume" value="82" />
-        <ctl name="RX2 Digital Volume" value="82" />
-    </path>
-
-    <path name="dock">
-        <path name="lineout" />
-        <ctl name="RX1 Digital Volume" value="83" />
-        <ctl name="RX2 Digital Volume" value="83" />
-        <ctl name="EAR PA Gain" value="POS_1P5_DB" />	
-    </path>
-
-    <path name="headphones">
-        <path name="ear" />
-        <ctl name="RX1 Digital Volume" value="81" />
-        <ctl name="RX2 Digital Volume" value="81" />
-        <ctl name="EAR PA Gain" value="POS_1P5_DB" />	
-    </path>
-
-    <path name="speaker-and-headphones">
-        <path name="spk-ear" />
-        <ctl name="RX1 Digital Volume" value="56" />
-        <ctl name="RX2 Digital Volume" value="56" />
-        <ctl name="RX3 Digital Volume" value="79" />
-        <ctl name="EAR PA Gain" value="POS_1P5_DB" />	
-    </path>
-
-    <path name="speaker-and-hdmi">
-        <path name="spk" />
-        <ctl name="RX3 Digital Volume" value="84" />
-    </path>
-
-    <path name="speaker-and-proxy">
-        <path name="spk" />
-        <ctl name="RX3 Digital Volume" value="84" />
-    </path>
-
-    <path name="speaker-and-dock">
-	<path name="spk-lineout" />
-        <ctl name="RX1 Digital Volume" value="56" />
-        <ctl name="RX2 Digital Volume" value="56" />
-        <ctl name="RX3 Digital Volume" value="81" />
-        <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" />
-    </path>	
-
-    <path name="fm-headset">
-        <path name="ear" />
-        <ctl name="RX1 Digital Volume" value="84" />
-        <ctl name="RX2 Digital Volume" value="84" />
-        <ctl name="EAR PA Gain" value="POS_1P5_DB" />
-    </path>
-
-    <!-- end of Play Scenario -->
-
-    <!-- ================================================================ -->
-    <!-- Recording Scenario  -->
-    <path name="rec-main-mic">
-        <path name="main-mic" />
-        <ctl name="DEC1 Volume" value="88" />
-        <ctl name="ADC1 Volume" value="2" />
-    </path>
-
-    <path name="rec-sub-mic">
-        <path name="sub-mic" />
-        <ctl name="DEC1 Volume" value="82" />
-        <ctl name="ADC3 Volume" value="4" />
-    </path>
-
-    <path name="rec-headset-mic">
-        <path name="ear-mic" />
-        <ctl name="DEC1 Volume" value="82" />
-        <ctl name="ADC2 Volume" value="4" />
-    </path>
-
-    <path name="rec-stereo-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">
-        <path name="rec-main-mic" />
-    </path>
-
-    <path name="rec-high-gain-sub-mic">
-        <path name="rec-sub-mic" />
-    </path>
-
-    <path name="rec-high-gain-headset-mic">
-        <path name="rec-headset-mic" />
-    </path>
-
-    <path name="rec-high-gain-stereo-mic">
-        <path name="rec-main-mic" />
-    </path>
-
-    <path name="rec-NS-mic-interview">
-        <path name="main-sub-mic" />
-        <ctl name="DEC1 Volume" value="84" />
-        <ctl name="ADC1 Volume" value="4" />
-        <ctl name="ADC3 Volume" value="4" />
-    </path>
-
-    <path name="rec-NS-mic-conversation">
-        <path name="main-sub-mic" />
-        <ctl name="DEC1 Volume" value="84" />
-        <ctl name="ADC1 Volume" value="4" />
-        <ctl name="ADC3 Volume" value="4" />
-    </path>
-
-    <path name="rec-NS-mic-conference">
-        <path name="main-sub-mic" />
-        <ctl name="DEC1 Volume" value="84" />
-        <ctl name="ADC1 Volume" value="4" />
-        <ctl name="ADC3 Volume" value="4" />
-    </path>
-    <!-- end of Recording Scenario -->
-
-    <!-- ================================================================ -->
-    <!-- recognition Scenario -->
-    <path name="vr-main-mic">
-        <path name="main-mic" />
-        <ctl name="DEC1 Volume" value="80" />
-        <ctl name="ADC1 Volume" value="40" />
-    </path>
-
-    <path name="vr-sub-mic">
-        <path name="sub-mic" />
-        <ctl name="DEC1 Volume" value="84" />
-        <ctl name="ADC3 Volume" value="4" />
-    </path>
-
-    <path name="vr-headset-mic">
-        <path name="ear-mic" />
-        <ctl name="DEC1 Volume" value="82" />
-        <ctl name="ADC2 Volume" value="4" />
-    </path>
-
-    <path name="bargein1-main-mic">
-        <path name="main-mic" />
-        <ctl name="DEC1 Volume" value="82" />
-        <ctl name="ADC1 Volume" value="4" />
-    </path>
-
-    <path name="bargein1-sub-mic">
-        <path name="sub-mic" />
-        <ctl name="DEC1 Volume" value="103" />
-        <ctl name="ADC3 Volume" value="4" />
-    </path>
-
-    <path name="bargein1-earphone-mic">
-        <path name="main-mic" />
-        <ctl name="DEC1 Volume" value="82" />
-        <ctl name="ADC1 Volume" value="4" />
-    </path>
-
-    <path name="bargein1-headset-mic">
-        <path name="ear-mic" />
-        <ctl name="DEC1 Volume" value="82" />
-        <ctl name="ADC2 Volume" value="4" />
-    </path>
-
-    <path name="bargein2-main-mic">
-        <path name="main-mic" />
-        <ctl name="DEC1 Volume" value="82" />
-        <ctl name="ADC1 Volume" value="4" />
-    </path>
-
-    <path name="bargein2-sub-mic">
-        <path name="sub-mic" />
-        <ctl name="DEC1 Volume" value="103" />
-        <ctl name="ADC3 Volume" value="4" />
-    </path>
-
-    <path name="bargein2-earphone-mic">
-        <path name="main-mic" />
-        <ctl name="DEC1 Volume" value="82" />
-        <ctl name="ADC1 Volume" value="4" />
-    </path>
-
-    <path name="bargein2-headset-mic">
-        <path name="ear-mic" />
-        <ctl name="DEC1 Volume" value="82" />
-        <ctl name="ADC2 Volume" value="4" />
-    </path>
-
-    <path name="svoice-main-mic">
-        <path name="main-mic" />
-        <ctl name="DEC1 Volume" value="82" />
-        <ctl name="ADC1 Volume" value="4" />
-    </path>
-
-    <path name="svoice-NS-mic">
-        <path name="main-sub-mic" />
-    </path>
-
-    <path name="sdriving-NS-mic">
-        <path name="main-sub-mic" />
-    </path>
-
-    <path name="voice-wakeup">
-    </path>
-
-    <path name="voice-wakeup-lpsd">
-    </path>
-    <!-- end of recognition Scenario -->
-
-    <!-- ================================================================ -->
-    <!-- Voice call Scenario -->
-    <!-- RX part -->
-    <path name="voice-call-handset">
-        <path name="rcv" />
-        <ctl name="RX1 Digital Volume" value="79" />
-    </path>
-
-    <path name="voice-call-handset-extra-vol">
-        <path name="rcv" />
-        <ctl name="RX1 Digital Volume" value="79" />
-    </path>
-
-    <path name="voice-call-handset-emergency">
-        <path name="rcv" />
-        <ctl name="RX1 Digital Volume" value="81" />
-    </path>
-
-    <path name="voice-call-handset-hac">
-        <path name="rcv" />
-        <ctl name="RX1 Digital Volume" value="81" />
-    </path>
-
-    <path name="voice-call-speaker">
-        <path name="spk" />
-        <ctl name="RX3 Digital Volume" value="83" />
-    </path>
-
-    <path name="voice-call-speaker-extra-vol">
-        <path name="spk" />
-        <ctl name="RX3 Digital Volume" value="83" />
-    </path>
-
-    <path name="voice-call-speaker-emergency">
-        <path name="spk" />
-        <ctl name="RX3 Digital Volume" value="83" />
-    </path>
-
-    <path name="voice-call-headset">
-        <path name="ear" />
-        <ctl name="RX1 Digital Volume" value="84" />
-        <ctl name="RX2 Digital Volume" value="84" />
-        <ctl name="EAR PA Gain" value="POS_1P5_DB" />	
-    </path>
-
-    <path name="voice-call-dock">
-    </path>
-
-    <!-- TX part -->
-    <path name="voice-call-main-mic">
-        <path name="main-mic" />
-        <ctl name="DEC1 Volume" value="84" />
-        <ctl name="ADC1 Volume" value="4" />
-    </path>
-
-    <path name="voice-call-main-mic-emergency">
-        <path name="main-mic" />
-        <ctl name="DEC1 Volume" value="84" />
-        <ctl name="ADC1 Volume" value="4" />
-    </path>
-
-    <path name="voice-call-sub-mic">
-        <path name="sub-mic" />
-        <ctl name="DEC1 Volume" value="68" />
-        <ctl name="ADC3 Volume" value="4" />
-    </path>
-
-    <path name="voice-call-sub-mic-emergency">
-        <path name="sub-mic" />
-        <ctl name="DEC1 Volume" value="68" />
-        <ctl name="ADC3 Volume" value="4" />
-    </path>
-
-    <path name="voice-call-headphone-mic">
-        <path name="main-mic" />
-        <ctl name="DEC1 Volume" value="84" />
-        <ctl name="ADC1 Volume" value="4" />
-    </path>
-
-    <path name="voice-call-headset-mic">
-        <path name="ear-mic" />
-        <ctl name="DEC1 Volume" value="94" />
-        <ctl name="ADC2 Volume" value="4" />
-    </path>
-
-    <path name="voice-call-NS-mic-handset">
-        <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="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  -->
-
-    <!-- ================================================================ -->
-    <!-- Voice call cp2 Scenario -->
-    <!-- RX part -->
-    <path name="voice-call-cp2-handset">
-        <path name="rcv" />
-        <ctl name="RX1 Digital Volume" value="79" />
-    </path>
-
-    <path name="voice-call-cp2-handset-extra-vol">
-        <path name="rcv" />
-        <ctl name="RX1 Digital Volume" value="79" />
-    </path>
-
-    <path name="voice-call-cp2-handset-emergency">
-        <path name="rcv" />
-        <ctl name="RX1 Digital Volume" value="81" />
-    </path>
-
-    <path name="voice-call-cp2-handset-hac">
-        <path name="rcv" />
-        <ctl name="RX1 Digital Volume" value="84" />
-    </path>
-
-    <path name="voice-call-cp2-speaker">
-        <path name="spk" />
-        <ctl name="RX3 Digital Volume" value="84" />
-    </path>
-
-    <path name="voice-call-cp2-speaker-extra-vol">
-        <path name="spk" />
-        <ctl name="RX3 Digital Volume" value="84" />
-    </path>
-
-    <path name="voice-call-cp2-speaker-emergency">
-        <path name="spk" />
-        <ctl name="RX3 Digital Volume" value="80" />
-    </path>
-
-    <path name="voice-call-cp2-headset">
-        <path name="ear" />
-        <ctl name="RX1 Digital Volume" value="84" />
-        <ctl name="RX2 Digital Volume" value="84" />
-        <ctl name="EAR PA Gain" value="POS_1P5_DB" />	
-    </path>
-
-    <path name="voice-call-cp2-dock">
-    </path>
-
-    <!-- TX part -->
-    <path name="voice-call-cp2-main-mic">
-        <path name="main-mic" />
-        <ctl name="DEC1 Volume" value="84" />
-        <ctl name="ADC1 Volume" value="4" />
-    </path>
-
-    <path name="voice-call-cp2-main-mic-emergency">
-        <path name="main-mic" />
-        <ctl name="DEC1 Volume" value="84" />
-        <ctl name="ADC1 Volume" value="4" />
-    </path>
-
-    <path name="voice-call-cp2-sub-mic">
-        <path name="sub-mic" />
-        <ctl name="DEC1 Volume" value="68" />
-        <ctl name="ADC3 Volume" value="4" />
-    </path>
-
-    <path name="voice-call-cp2-sub-mic-emergency">
-        <path name="sub-mic" />
-        <ctl name="DEC1 Volume" value="68" />
-        <ctl name="ADC3 Volume" value="4" />
-    </path>
-
-    <path name="voice-call-cp2-headphone-mic">
-        <path name="main-mic" />
-        <ctl name="DEC1 Volume" value="84" />
-        <ctl name="ADC1 Volume" value="4" />
-    </path>
-
-    <path name="voice-call-cp2-headset-mic">
-        <path name="ear-mic" />
-        <ctl name="DEC1 Volume" value="94" />
-        <ctl name="ADC2 Volume" value="4" />
-    </path>
-
-    <path name="voice-call-cp2-NS-mic-handset">
-        <path name="voice-call-main-mic" />
-    </path>
-
-    <path name="voice-call-cp2-NS-mic-speaker">
-        <path name="voice-call-main-mic" />
-    </path>
-    <!-- end of Voice call cp2 Scenario  -->
-
-    <!-- ================================================================ -->
-    <!-- call forward Scenario -->
-    <path name="voice-call-forward">
-    	<path name="rcv" />
-        <ctl name="RX1 Digital Volume" value="0" />
-    </path>
-
-    <path name="voice-call-forward-mic">
-        <path name="main-mic" />
-        <ctl name="DEC1 Volume" value="0" />
-        <ctl name="ADC1 Volume" value="0" />
-    </path>
-    <!-- end of call forward Scenario -->
-
-    <!-- ================================================================ -->
-    <!-- Video call Scenario -->
-    <!-- RX part -->
-    <path name="video-call-handset">
-        <path name="rcv" />
-        <ctl name="RX1 Digital Volume" value="79" />
-    </path>
-
-    <path name="video-call-handset-extra-vol">
-        <path name="video-call-handset" />
-    </path>
-
-    <path name="video-call-speaker">
-        <path name="spk" />
-        <ctl name="RX3 Digital Volume" value="83" />
-    </path>
-
-    <path name="video-call-speaker-extra-vol">
-        <path name="video-call-speaker" />
-    </path>
-
-    <path name="video-call-headset">
-        <path name="ear" />
-        <ctl name="RX1 Digital Volume" value="84" />
-        <ctl name="RX2 Digital Volume" value="84" />
-        <ctl name="EAR PA Gain" value="POS_1P5_DB" />	
-    </path>
-
-    <path name="video-call-dock">
-    </path>
-
-    <!-- TX part -->
-    <path name="video-call-main-mic">
-        <path name="main-mic" />
-        <ctl name="DEC1 Volume" value="84" />
-        <ctl name="ADC1 Volume" value="4" />
-    </path>
-
-    <path name="video-call-sub-mic">
-        <path name="voice-call-sub-mic" />
-    </path>
-
-    <path name="video-call-headphone-mic">
-        <path name="main-mic" />
-        <ctl name="DEC1 Volume" value="84" />
-        <ctl name="ADC1 Volume" value="4" />
-    </path>
-
-    <path name="video-call-headset-mic">
-        <path name="ear-mic" />
-        <ctl name="DEC1 Volume" value="94" />
-        <ctl name="ADC2 Volume" value="4" />
-    </path>
-
-    <path name="video-call-NS-mic-handset">
-        <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="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  -->
-
-    <!-- ================================================================ -->
-    <!-- VoLTE Voice call Scenario -->
-    <!-- RX part -->
-    <path name="VoLTE-voice-handset">
-        <path name="rcv" />
-        <ctl name="RX1 Digital Volume" value="79" />
-    </path>
-
-    <path name="VoLTE-voice-handset-extra-vol">
-        <path name="rcv" />
-        <ctl name="RX1 Digital Volume" value="79" />
-    </path>
-
-    <path name="VoLTE-voice-handset-hac">
-        <path name="rcv" />
-        <ctl name="RX1 Digital Volume" value="81" />
-    </path>
-
-    <path name="VoLTE-voice-speaker">
-        <path name="spk" />
-        <ctl name="RX3 Digital Volume" value="83" />
-    </path>
-
-    <path name="VoLTE-voice-speaker-extra-vol">
-        <path name="spk" />
-        <ctl name="RX3 Digital Volume" value="83" />
-    </path>
-
-    <path name="VoLTE-voice-headset">
-        <path name="ear" />
-        <ctl name="RX1 Digital Volume" value="84" />
-        <ctl name="RX2 Digital Volume" value="84" />
-        <ctl name="EAR PA Gain" value="POS_1P5_DB" />	
-    </path>
-
-    <path name="VoLTE-voice-dock">
-    </path>
-
-    <!-- TX part -->
-    <path name="VoLTE-voice-main-mic">
-        <path name="main-mic" />
-        <ctl name="DEC1 Volume" value="84" />
-        <ctl name="ADC1 Volume" value="4" />
-    </path>
-
-    <path name="VoLTE-voice-sub-mic">
-        <path name="sub-mic" />
-        <ctl name="DEC1 Volume" value="68" />
-        <ctl name="ADC3 Volume" value="4" />
-    </path>
-
-    <path name="VoLTE-voice-headphone-mic">
-        <path name="main-mic" />
-        <ctl name="DEC1 Volume" value="84" />
-        <ctl name="ADC1 Volume" value="4" />
-    </path>
-
-    <path name="VoLTE-voice-headset-mic">
-        <path name="ear-mic" />
-        <ctl name="DEC1 Volume" value="94" />
-        <ctl name="ADC2 Volume" value="4" />
-    </path>
-
-    <path name="VoLTE-voice-NS-mic-handset">
-        <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="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  -->
-
-    <!-- ================================================================ -->
-    <!-- VoLTE Video call Scenario -->
-    <!-- RX part -->
-    <path name="VoLTE-video-handset">
-        <path name="rcv" />
-        <ctl name="RX1 Digital Volume" value="81" />
-    </path>
-
-    <path name="VoLTE-video-handset-extra-vol">
-        <path name="rcv" />
-        <ctl name="RX1 Digital Volume" value="81" />
-    </path>
-
-    <path name="VoLTE-video-speaker">
-        <path name="spk" />
-        <ctl name="RX3 Digital Volume" value="80" />
-    </path>
-
-    <path name="VoLTE-video-speaker-extra-vol">
-        <path name="spk" />
-        <ctl name="RX3 Digital Volume" value="80" />
-    </path>
-
-    <path name="VoLTE-video-headset">
-        <path name="ear" />
-        <ctl name="RX1 Digital Volume" value="84" />
-        <ctl name="RX2 Digital Volume" value="84" />
-        <ctl name="EAR PA Gain" value="POS_1P5_DB" />	
-    </path>
-
-    <path name="VoLTE-video-dock">
-    </path>
-
-    <!-- TX part -->
-    <path name="VoLTE-video-main-mic">
-        <path name="main-mic" />
-        <ctl name="DEC1 Volume" value="84" />
-        <ctl name="ADC1 Volume" value="4" />
-    </path>
-
-    <path name="VoLTE-video-sub-mic">
-        <path name="sub-mic" />
-        <ctl name="DEC1 Volume" value="68" />
-        <ctl name="ADC3 Volume" value="4" />
-    </path>
-
-    <path name="VoLTE-video-headphone-mic">
-        <path name="ear-mic" />
-        <ctl name="DEC1 Volume" value="84" />
-        <ctl name="ADC2 Volume" value="4" />
-    </path>
-
-    <path name="VoLTE-video-headset-mic">
-        <path name="ear-mic" />
-        <ctl name="DEC1 Volume" value="84" />
-        <ctl name="ADC2 Volume" value="4" />
-    </path>
-
-    <path name="VoLTE-video-NS-mic-handset">
-        <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="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  -->
-
-    <!-- ================================================================ -->
-    <!-- TTY Scenario  -->
-    <!-- RX part -->
-    <path name="TTY-handset">
-        <path name="rcv" />
-        <ctl name="RX1 Digital Volume" value="84" />
-    </path>
-
-    <path name="TTY-handset-extra-vol">
-        <path name="rcv" />
-        <ctl name="RX1 Digital Volume" value="84" />
-    </path>
-
-    <path name="TTY-headset">
-        <path name="ear" />
-        <ctl name="RX1 Digital Volume" value="86" />
-        <ctl name="RX2 Digital Volume" value="86" />
-        <ctl name="EAR PA Gain" value="POS_1P5_DB" />	
-    </path>
-
-    <path name="TTY-full">
-        <path name="ear" />
-        <ctl name="RX1 Digital Volume" value="86" />
-        <ctl name="RX2 Digital Volume" value="86" />
-        <ctl name="EAR PA Gain" value="POS_1P5_DB" />	
-    </path>
-
-    <!-- TX part -->
-    <path name="TTY-vco-mic">
-        <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 -->
-
-    <!-- ================================================================ -->
-    <!-- VoIP Scenario -->
-    <!-- RX part -->
-    <path name="voip-handset-comm">
-        <path name="rcv" />
-        <ctl name="RX1 Digital Volume" value="81" />
-    </path>
-
-    <path name="voip-speaker-comm">
-        <path name="spk" />
-        <ctl name="RX3 Digital Volume" value="82" />
-    </path>
-
-    <path name="voip-headset-comm">
-        <path name="ear" />
-        <ctl name="RX1 Digital Volume" value="84" />
-        <ctl name="RX2 Digital Volume" value="84" />
-        <ctl name="EAR PA Gain" value="POS_1P5_DB" />	
-    </path>
-
-    <path name="voip-handset-others">
-        <path name="rcv" />
-        <ctl name="RX1 Digital Volume" value="81" />
-    </path>
-
-    <path name="voip-speaker-others">
-        <path name="spk" />
-        <ctl name="RX3 Digital Volume" value="80" />
-    </path>
-
-    <path name="voip-headset-others">
-        <path name="ear" />
-        <ctl name="RX1 Digital Volume" value="86" />
-        <ctl name="RX2 Digital Volume" value="86" />
-        <ctl name="EAR PA Gain" value="POS_1P5_DB" />	
-    </path>
-
-    <path name="voip-handset-chaton">
-        <path name="rcv" />
-        <ctl name="RX1 Digital Volume" value="81" />
-    </path>
-
-    <path name="voip-speaker-chaton">
-        <path name="spk" />
-        <ctl name="RX3 Digital Volume" value="80" />
-    </path>
-
-    <path name="voip-headset-chaton">
-        <path name="ear" />
-        <ctl name="RX1 Digital Volume" value="86" />
-        <ctl name="RX2 Digital Volume" value="86" />
-        <ctl name="EAR PA Gain" value="POS_1P5_DB" />	
-    </path>
-
-    <path name="voip-handset-callforwarding">
-        <path name="rcv" />
-        <ctl name="RX1 Digital Volume" value="81" />
-    </path>
-
-    <path name="voip-speaker-callforwarding">
-        <path name="spk" />
-        <ctl name="RX3 Digital Volume" value="80" />
-    </path>
-
-    <path name="voip-headset-callforwarding">
-        <path name="ear" />
-        <ctl name="RX1 Digital Volume" value="86" />
-        <ctl name="RX2 Digital Volume" value="86" />
-        <ctl name="EAR PA Gain" value="POS_1P5_DB" />	
-    </path>
-
-    <path name="voip-handset-webex">
-        <path name="rcv" />
-        <ctl name="RX1 Digital Volume" value="81" />
-    </path>
-
-    <path name="voip-speaker-webex">
-        <path name="spk" />
-        <ctl name="RX3 Digital Volume" value="80" />
-    </path>
-
-    <path name="voip-headset-webex">
-        <path name="ear" />
-        <ctl name="RX1 Digital Volume" value="86" />
-        <ctl name="RX2 Digital Volume" value="86" />
-        <ctl name="EAR PA Gain" value="POS_1P5_DB" />	
-    </path>
-
-    <path name="voip-handset-carrier">
-        <path name="rcv" />
-        <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" />
-        <ctl name="RX2 Digital Volume" value="86" />
-        <ctl name="EAR PA Gain" value="POS_1P5_DB" />	
-    </path>
-
-    <path name="voip-handset-nonpcm">
-        <path name="rcv" />
-        <ctl name="RX1 Digital Volume" value="81" />
-    </path>
-
-    <path name="voip-speaker-nonpcm">
-        <path name="spk" />
-        <ctl name="RX3 Digital Volume" value="80" />
-    </path>
-
-    <path name="voip-headset-nonpcm">
-        <path name="ear" />
-        <ctl name="RX1 Digital Volume" value="86" />
-        <ctl name="RX2 Digital Volume" value="86" />
-        <ctl name="EAR PA Gain" value="POS_1P5_DB" />	
-    </path>
-
-    <!-- TX part -->
-    <path name="voip-main-mic-comm">
-        <path name="main-mic" />
-        <ctl name="DEC1 Volume" value="84" />
-        <ctl name="ADC1 Volume" value="4" />
-    </path>
-
-    <path name="voip-sub-mic-comm">
-        <path name="sub-mic" />
-        <ctl name="DEC1 Volume" value="68" />
-        <ctl name="ADC3 Volume" value="4" />
-    </path>
-
-    <path name="voip-headphone-mic-comm">
-        <path name="main-mic" />
-        <ctl name="DEC1 Volume" value="84" />
-        <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="14" />
-    </path>
-
-    <path name="voip-main-mic-others">
-        <path name="main-mic" />
-        <ctl name="DEC1 Volume" value="84" />
-        <ctl name="ADC1 Volume" value="4" />
-    </path>
-
-    <path name="voip-sub-mic-others">
-        <path name="sub-mic" />
-        <ctl name="DEC1 Volume" value="68" />
-        <ctl name="ADC3 Volume" value="4" />
-    </path>
-
-    <path name="voip-headphone-mic-others">
-        <path name="main-mic" />
-        <ctl name="DEC1 Volume" value="84" />
-        <ctl name="ADC1 Volume" value="4" />
-    </path>
-
-    <path name="voip-headset-mic-others">
-        <path name="ear-mic" />
-        <ctl name="DEC1 Volume" value="84" />
-        <ctl name="ADC2 Volume" value="4" />
-    </path>
-
-    <path name="voip-main-mic-chaton">
-        <path name="main-mic" />
-        <ctl name="DEC1 Volume" value="84" />
-        <ctl name="ADC1 Volume" value="4" />
-    </path>
-
-    <path name="voip-sub-mic-chaton">
-        <path name="sub-main-mic" />
-    </path>
-
-    <path name="voip-headphone-mic-chaton">
-        <path name="ear-mic" />
-        <ctl name="DEC1 Volume" value="84" />
-        <ctl name="ADC2 Volume" value="4" />
-    </path>
-
-    <path name="voip-headset-mic-chaton">
-        <path name="ear-mic" />
-        <ctl name="DEC1 Volume" value="84" />
-        <ctl name="ADC2 Volume" value="4" />
-    </path>
-
-    <path name="voip-main-mic-callforwarding">
-        <path name="main-mic" />
-        <ctl name="DEC1 Volume" value="84" />
-        <ctl name="ADC1 Volume" value="4" />
-    </path>
-
-    <path name="voip-sub-mic-callforwarding">
-        <path name="sub-mic" />
-        <ctl name="DEC1 Volume" value="68" />
-        <ctl name="ADC3 Volume" value="4" />
-    </path>
-
-    <path name="voip-headphone-mic-callforwarding">
-        <path name="ear-mic" />
-        <ctl name="DEC1 Volume" value="84" />
-        <ctl name="ADC2 Volume" value="4" />
-    </path>
-
-    <path name="voip-headset-mic-callforwarding">
-        <path name="ear-mic" />
-        <ctl name="DEC1 Volume" value="84" />
-        <ctl name="ADC2 Volume" value="4" />
-    </path>
-
-    <path name="voip-main-mic-webex">
-        <path name="main-mic" />
-        <ctl name="DEC1 Volume" value="84" />
-        <ctl name="ADC1 Volume" value="4" />
-    </path>
-
-    <path name="voip-sub-mic-webex">
-        <path name="sub-mic" />
-        <ctl name="DEC1 Volume" value="68" />
-        <ctl name="ADC3 Volume" value="4" />
-    </path>
-
-    <path name="voip-headphone-mic-webex">
-        <path name="ear-mic" />
-        <ctl name="DEC1 Volume" value="84" />
-        <ctl name="ADC2 Volume" value="4" />
-    </path>
-
-    <path name="voip-headset-mic-webex">
-        <path name="ear-mic" />
-        <ctl name="DEC1 Volume" value="84" />
-        <ctl name="ADC2 Volume" value="4" />
-    </path>
-
-    <path name="voip-main-mic-carrier">
-        <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">
-        <path name="sub-mic" />
-        <ctl name="DEC1 Volume" value="68" />
-        <ctl name="ADC3 Volume" value="4" />
-    </path>
-
-    <path name="voip-headphone-mic-carrier">
-        <path name="main-mic" />
-        <ctl name="DEC1 Volume" value="84" />
-        <ctl name="ADC1 Volume" value="4" />
-    </path>
-
-    <path name="voip-headset-mic-carrier">
-        <path name="ear-mic" />
-        <ctl name="DEC1 Volume" value="84" />
-        <ctl name="ADC2 Volume" value="4" />
-    </path>
-
-    <path name="voip-main-mic-nonpcm">
-        <path name="main-mic" />
-        <ctl name="DEC1 Volume" value="84" />
-        <ctl name="ADC1 Volume" value="4" />
-    </path>
-
-    <path name="voip-sub-mic-nonpcm">
-        <path name="sub-mic" />
-        <ctl name="DEC1 Volume" value="68" />
-        <ctl name="ADC3 Volume" value="4" />
-    </path>
-
-    <path name="voip-headphone-mic-nonpcm">
-        <path name="main-mic" />
-        <ctl name="DEC1 Volume" value="84" />
-        <ctl name="ADC1 Volume" value="4" />
-    </path>
-
-    <path name="voip-headset-mic-nonpcm">
-        <path name="ear-mic" />
-        <ctl name="DEC1 Volume" value="84" />
-        <ctl name="ADC2 Volume" value="4" />
-    </path>
-    <!-- end of VoIP Scenario -->
-
-    <!-- ================================================================ -->
-    <!-- Factory Scenario -->
-    <!-- RX part -->
-    <path name="loopback-handset-DSP">
-        <path name="rcv" />
-        <ctl name="RX1 Digital Volume" value="84" />
-    </path>
-
-    <path name="loopback-handset-2mic-on-DSP">
-        <path name="rcv" />
-        <ctl name="RX1 Digital Volume" value="84" />
-    </path>
-
-    <path name="loopback-speaker-DSP">
-        <path name="spk" />
-        <ctl name="RX3 Digital Volume" value="80" />
-    </path>
-
-    <path name="loopback-headset-DSP">
-        <path name="ear" />
-        <ctl name="RX1 Digital Volume" value="84" />
-        <ctl name="RX2 Digital Volume" value="84" />
-        <ctl name="EAR PA Gain" value="POS_1P5_DB" />	
-    </path>
-
-    <path name="loopback-handset">
-        <path name="rcv" />
-        <ctl name="RX1 Digital Volume" value="84" />
-    </path>
-
-    <path name="loopback-handset-2mic-on">
-        <path name="rcv" />
-        <ctl name="RX1 Digital Volume" value="84" />
-    </path>
-
-    <path name="loopback-speaker">
-        <path name="spk" />
-        <ctl name="RX3 Digital Volume" value="80" />
-    </path>
-
-    <path name="loopback-headset">
-        <path name="ear" />
-        <ctl name="RX1 Digital Volume" value="84" />
-        <ctl name="RX2 Digital Volume" value="84" />
-        <ctl name="EAR PA Gain" value="POS_1P5_DB" />	
-    </path>
-
-    <!-- TX part -->
-    <path name="loopback-main-mic-DSP">
-        <path name="main-mic" />
-        <ctl name="ADC1 Volume" value="10" />
-        <ctl name="DEC1 Volume" value="81" />
-    </path>
-
-    <path name="loopback-main-mic-2mic-on-DSP">
-        <path name="main-mic" />
-        <ctl name="ADC1 Volume" value="4" />
-        <ctl name="DEC1 Volume" value="69" />
-    </path>
-
-    <path name="loopback-sub-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">
-        <path name="loopback-main-mic-DSP" />
-    </path>
-
-    <path name="loopback-headphone-mic-DSP">
-        <path name="main-mic" />
-        <ctl name="ADC1 Volume" value="4" />
-        <ctl name="DEC1 Volume" value="69" />
-    </path>
-
-    <path name="loopback-headset-mic-DSP">
-        <path name="ear-mic" />
-        <ctl name="DEC1 Volume" value="84" />
-        <ctl name="ADC2 Volume" value="20" />
-    </path>
-
-    <path name="loopback-main-mic">
-        <path name="main-mic" />
-        <ctl name="ADC1 Volume" value="4" />
-        <ctl name="DEC1 Volume" value="69" />
-    </path>
-
-    <path name="loopback-main-mic-2mic-on">
-        <path name="main-mic" />
-        <ctl name="ADC1 Volume" value="4" />
-        <ctl name="DEC1 Volume" value="69" />
-    </path>
-
-    <path name="loopback-sub-mic">
-        <path name="sub-mic" />
-        <ctl name="DEC1 Volume" value="68" />
-        <ctl name="ADC3 Volume" value="4" />
-    </path>
-
-    <path name="loopback-3rd-mic">
-        <path name="3rd-mic" />
-    </path>
-
-    <path name="loopback-headphone-mic">
-        <path name="main-mic" />
-        <ctl name="ADC1 Volume" value="4" />
-        <ctl name="DEC1 Volume" value="69" />
-    </path>
-
-    <path name="loopback-headset-mic">
-        <path name="ear-mic" />
-        <ctl name="DEC1 Volume" value="84" />
-        <ctl name="ADC2 Volume" value="20" />
-    </path>
-    <!-- end of Factory Scenario -->
-
-    <!-- Factory Scenario CP2-->
-    <!-- RX part -->
-    <path name="loopback-cp2-handset-DSP">
-        <path name="rcv" />
-        <ctl name="RX1 Digital Volume" value="84" />
-    </path>
-
-    <path name="loopback-cp2-handset-2mic-on-DSP">
-        <path name="rcv" />
-        <ctl name="RX1 Digital Volume" value="84" />
-    </path>
-
-    <path name="loopback-cp2-speaker-DSP">
-        <path name="spk" />
-        <ctl name="RX3 Digital Volume" value="80" />
-    </path>
-
-    <path name="loopback-cp2-headset-DSP">
-        <path name="ear" />
-        <ctl name="RX1 Digital Volume" value="84" />
-        <ctl name="RX2 Digital Volume" value="84" />
-        <ctl name="EAR PA Gain" value="POS_1P5_DB" />	
-    </path>
-
-    <path name="loopback-cp2-handset">
-        <path name="rcv" />
-        <ctl name="RX1 Digital Volume" value="84" />
-    </path>
-
-    <path name="loopback-cp2-handset-2mic-on">
-        <path name="rcv" />
-        <ctl name="RX1 Digital Volume" value="84" />
-    </path>
-
-    <path name="loopback-cp2-speaker">
-        <path name="spk" />
-        <ctl name="RX3 Digital Volume" value="80" />
-    </path>
-
-    <path name="loopback-cp2-headset">
-        <path name="ear" />
-        <ctl name="RX1 Digital Volume" value="84" />
-        <ctl name="RX2 Digital Volume" value="84" />
-        <ctl name="EAR PA Gain" value="POS_1P5_DB" />	
-    </path>
-
-    <!-- TX part -->
-    <path name="loopback-cp2-main-mic-DSP">
-        <path name="main-mic" />
-        <ctl name="ADC1 Volume" value="4" />
-        <ctl name="DEC1 Volume" value="69" />
-    </path>
-
-    <path name="loopback-cp2-main-mic-2mic-on-DSP">
-        <path name="main-mic" />
-        <ctl name="ADC1 Volume" value="4" />
-        <ctl name="DEC1 Volume" value="69" />
-    </path>
-
-    <path name="loopback-cp2-sub-mic-DSP">
-        <path name="loopback-sub-mic-DSP" />
-    </path>
-
-    <path name="loopback-cp2-3rd-mic-DSP">
-        <path name="loopback-main-mic-DSP" />
-    </path>
-
-    <path name="loopback-cp2-headphone-mic-DSP">
-        <path name="main-mic" />
-        <ctl name="ADC1 Volume" value="4" />
-        <ctl name="DEC1 Volume" value="69" />
-    </path>
-
-    <path name="loopback-cp2-headset-mic-DSP">
-        <path name="ear-mic" />
-        <ctl name="DEC1 Volume" value="84" />
-        <ctl name="ADC2 Volume" value="20" />
-    </path>
-
-    <path name="loopback-cp2-main-mic">
-        <path name="main-mic" />
-        <ctl name="ADC1 Volume" value="4" />
-        <ctl name="DEC1 Volume" value="69" />
-    </path>
-
-    <path name="loopback-cp2-main-mic-2mic-on">
-        <path name="main-mic" />
-        <ctl name="ADC1 Volume" value="4" />
-        <ctl name="DEC1 Volume" value="69" />
-    </path>
-
-    <path name="loopback-cp2-sub-mic">
-        <path name="sub-mic" />
-        <ctl name="DEC1 Volume" value="68" />
-        <ctl name="ADC3 Volume" value="4" />
-    </path>
-
-    <path name="loopback-cp2-3rd-mic">
-        <path name="3rd-mic" />
-    </path>
-
-    <path name="loopback-cp2-headphone-mic">
-        <path name="main-mic" />
-        <ctl name="ADC1 Volume" value="4" />
-        <ctl name="DEC1 Volume" value="69" />
-    </path>
-
-    <path name="loopback-cp2-headset-mic">
-        <path name="ear-mic" />
-        <ctl name="DEC1 Volume" value="84" />
-        <ctl name="ADC2 Volume" value="20" />
-    </path>
-    <!-- end of Factory Scenario cp2-->	
-
-    <path name="dummy">
-    </path>
-
-</mixer>
diff --git a/audio/spr/mixer_paths.xml b/audio/mixer_paths.xml
similarity index 84%
rename from audio/spr/mixer_paths.xml
rename to audio/mixer_paths.xml
index 33aeadb..80552f0 100644
--- a/audio/spr/mixer_paths.xml
+++ b/audio/mixer_paths.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
 <mixer>
-    <!-- Grand Prime LTE US SPR(without external amp) ================================================ -->
+    <!-- J5 3G EUR OPEN (L OS)(without external amp)================================================ -->
     <!-- These are the initial mixer settings -->
     <!-- reset RX/TX Start -->
     <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia1" value="0" />
@@ -46,9 +46,7 @@
     <ctl name="Incall_Music Audio Mixer MultiMedia2" value="0" />
     <ctl name="Incall_Music_2 Audio Mixer MultiMedia9" value="0" />
 
-    <ctl name="RX2 MIX2 INP2" value="ZERO" />
     <ctl name="RX2 MIX2 INP1" value="ZERO" />
-    <ctl name="RX1 MIX2 INP2" value="ZERO" />
     <ctl name="RX1 MIX2 INP1" value="ZERO" />
     <ctl name="RX3 MIX1 INP2" value="ZERO" />
     <ctl name="RX3 MIX1 INP1" value="ZERO" />
@@ -91,8 +89,7 @@
 
     <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 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" />
@@ -103,8 +100,7 @@
     <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="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" />
@@ -135,8 +131,7 @@
     <ctl name="ADC2 MUX" value="ZERO" />
 
     <ctl name="MI2S_TX Channels" value="One" />
-
-<ctl name="VOC_EXT_EC MUX" value="NONE" />
+    <ctl name="VOC_EXT_EC MUX" value="NONE" />
 
     <ctl name="Internal BTSCO SampleRate" value="8000" />
 
@@ -147,9 +142,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" />
+    <ctl name="AUDIO_REF_EC_UL1 MUX" value="None" />
+    <ctl name="MICBIAS CAPLESS Switch" value="0" />    
 
     <!-- IIR -->
     <ctl name="IIR1 Band1" id ="0" value="268435456" />
@@ -193,6 +187,15 @@
         <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia1" value="1" />
     </path>
 
+    <path name="deep-buffer-playback speaker-amp">
+        <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia1" value="1" />
+    </path>
+
+    <path name="deep-buffer-playback speaker-and-headphones">
+        <path name="deep-buffer-playback" />
+        <path name="deep-buffer-playback speaker-amp" />
+    </path>
+
     <path name="deep-buffer-playback bt-sco">
         <ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia1" value="1" />
     </path>
@@ -211,7 +214,7 @@
 
     <path name="deep-buffer-playback speaker-and-usb-headphones">
         <path name="deep-buffer-playback usb-headphones" />
-        <path name="deep-buffer-playback" />
+        <path name="deep-buffer-playback speaker-amp" />
     </path>
 
     <path name="deep-buffer-playback transmission-fm">
@@ -219,8 +222,8 @@
     </path>
 
     <path name="deep-buffer-playback speaker-and-bt-sco">
-        <path name="deep-buffer-playback bt-sco" />
-        <path name="deep-buffer-playback" />
+	<path name="deep-buffer-playback bt-sco" />
+	<path name="deep-buffer-playback" />
     </path>
 
     <!-- low latency -->
@@ -228,6 +231,15 @@
         <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia5" value="1" />
     </path>
 
+    <path name="low-latency-playback speaker-amp">
+        <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia5" value="1" />
+    </path>
+
+    <path name="low-latency-playback speaker-and-headphones">
+        <path name="low-latency-playback" />
+        <path name="low-latency-playback speaker-amp" />
+    </path>
+
     <path name="low-latency-playback bt-sco">
         <ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia5" value="1" />
     </path>
@@ -246,7 +258,7 @@
 
     <path name="low-latency-playback speaker-and-usb-headphones">
         <path name="low-latency-playback usb-headphones" />
-        <path name="low-latency-playback" />
+        <path name="low-latency-playback speaker-amp" />
     </path>
 
     <path name="low-latency-playback transmission-fm">
@@ -263,6 +275,15 @@
         <ctl name="PRI_MI2S_RX Audio Mixer MultiMedia4" value="1" />
     </path>
 
+    <path name="compress-offload-playback speaker-amp">
+        <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia4" value="1" />
+    </path>
+
+    <path name="compress-offload-playback speaker-and-headphones">
+        <path name="compress-offload-playback" />
+        <path name="compress-offload-playback speaker-amp" />
+    </path>
+
     <path name="compress-offload-playback bt-sco">
         <ctl name="INTERNAL_BT_SCO_RX Audio Mixer MultiMedia4" value="1" />
     </path>
@@ -294,6 +315,10 @@
         <ctl name="MultiMedia1 Mixer TERT_MI2S_TX" value="1" />
     </path>
 
+    <path name="audio-record speaker-amp">
+        <ctl name="MultiMedia1 Mixer QUAT_MI2S_TX" value="1" />
+    </path>
+
     <path name="audio-record bt-sco">
         <ctl name="MultiMedia1 Mixer INTERNAL_BT_SCO_TX" value="1" />
     </path>
@@ -319,7 +344,12 @@
     <path name="voice-call">
         <ctl name="PRI_MI2S_RX_Voice Mixer CSVoice" value="1" />
         <ctl name="Voice_Tx Mixer TERT_MI2S_TX_Voice" value="1" />
-    </path>
+	</path>
+
+    <path name="voice-call speaker-amp">
+        <ctl name="QUAT_MI2S_RX_Voice Mixer CSVoice" value="1" />
+        <ctl name="Voice_Tx Mixer TERT_MI2S_TX_Voice" value="1" />
+	</path>
 
     <path name="voice-call bt-sco">
         <ctl name="INTERNAL_BT_SCO_RX_Voice Mixer CSVoice" value="1" />
@@ -341,6 +371,11 @@
         <ctl name="Voice2_Tx Mixer TERT_MI2S_TX_Voice2" value="1" />
     </path>
 
+    <path name="voice-call-cp2 speaker-amp">
+        <ctl name="QUAT_MI2S_RX_Voice Mixer Voice2" value="1" />
+        <ctl name="Voice2_Tx Mixer TERT_MI2S_TX_Voice2" value="1" />
+    </path>
+
     <path name="voice-call-cp2 bt-sco">
         <ctl name="INTERNAL_BT_SCO_RX_Voice Mixer Voice2" value="1" />
         <ctl name="Voice2_Tx Mixer INTERNAL_BT_SCO_TX_Voice2" value="1" />
@@ -351,6 +386,11 @@
         <ctl name="PRI_MI2S_RX Port Mixer INTERNAL_FM_TX" value="1" />
     </path>
 
+    <path name="play-fm speaker-amp">
+        <ctl name="Internal FM RX Volume" value="1" />
+        <ctl name="QUAT_MI2S_RX Port Mixer INTERNAL_FM_TX" value="1" />
+    </path>
+
     <path name="fm-input">
         <path name="audio-record capture-fm" />
     </path>
@@ -360,6 +400,11 @@
         <ctl name="VoWLAN_Tx Mixer TERT_MI2S_TX_VoWLAN" value="1" />
     </path>
 
+    <path name="vowlan-call speaker-amp">
+        <ctl name="QUAT_MI2S_RX_Voice Mixer VoWLAN" value="1" />
+        <ctl name="VoWLAN_Tx Mixer TERT_MI2S_TX_VoWLAN" value="1" />
+    </path>
+
     <path name="vowlan-call hdmi">
         <ctl name="HDMI_RX_Voice Mixer VoWLAN" value="1" />
         <ctl name="VoWLAN_Tx Mixer TERT_MI2S_TX_VoWLAN" value="1" />
@@ -386,6 +431,14 @@
         <ctl name="MultiMedia6 Mixer TERT_MI2S_TX" value="1" />
     </path>
 
+    <path name="echo-reference">
+        <ctl name="AUDIO_REF_EC_UL1 MUX" value="I2S_RX" />
+    </path>
+
+    <path name="echo-reference speaker-amp">
+        <ctl name="AUDIO_REF_EC_UL1 MUX" value="QUAT_MI2S_TX" />
+    </path>
+
     <path name="hfp-sco-wb">
         <ctl name="Internal BTSCO SampleRate" value="16000" />
         <path name="hfp-sco" />
@@ -459,6 +512,11 @@
         <ctl name="Voip_Tx Mixer TERT_MI2S_TX_Voip" value="1" />
     </path>
 
+    <path name="voip-call speaker-amp">
+        <ctl name="QUAT_MI2S_RX_Voice Mixer Voip" value="1" />
+        <ctl name="Voip_Tx Mixer TERT_MI2S_TX_Voip" value="1" />
+    </path>
+
     <path name="voip-call bt-sco">
         <ctl name="INTERNAL_BT_SCO_RX_Voice Mixer Voip" value="1" />
         <ctl name="Voip_Tx Mixer INTERNAL_BT_SCO_TX_Voip" value="1" />
@@ -467,7 +525,12 @@
     <path name="volte-call">
         <ctl name="PRI_MI2S_RX_Voice Mixer VoLTE" value="1" />
         <ctl name="VoLTE_Tx Mixer TERT_MI2S_TX_VoLTE" value="1" />
-   </path>
+    </path>
+
+    <path name="volte-call speaker-amp">
+        <ctl name="QUAT_MI2S_RX_Voice Mixer VoLTE" value="1" />
+        <ctl name="VoLTE_Tx Mixer TERT_MI2S_TX_VoLTE" value="1" />
+    </path>
 
    <path name="volte-call hdmi">
        <ctl name="HDMI_RX_Voice Mixer VoLTE" value="1" />
@@ -494,6 +557,11 @@
         <ctl name="Voip_Tx Mixer TERT_MI2S_TX_Voip" value="1" />
     </path>
 
+    <path name="compress-voip-call speaker-amp">
+        <ctl name="QUAT_MI2S_RX_Voice Mixer Voip" value="1" />
+        <ctl name="Voip_Tx Mixer TERT_MI2S_TX_Voip" value="1" />
+    </path>    
+
     <path name="compress-voip-call bt-sco">
         <ctl name="INTERNAL_BT_SCO_RX_Voice Mixer Voip" value="1" />
         <ctl name="Voip_Tx Mixer INTERNAL_BT_SCO_TX_Voip" value="1" />
@@ -509,6 +577,11 @@
         <ctl name="QCHAT_Tx Mixer TERT_MI2S_TX_QCHAT" value="1" />
     </path>
 
+    <path name="qchat-call speaker-amp">
+        <ctl name="QUAT_MI2S_RX_Voice Mixer QCHAT" value="1" />
+        <ctl name="QCHAT_Tx Mixer TERT_MI2S_TX_QCHAT" value="1" />
+    </path>
+
     <path name="qchat-call bt-sco">
         <ctl name="INTERNAL_BT_SCO_RX_Voice Mixer QCHAT" value="1" />
         <ctl name="QCHAT_Tx Mixer INTERNAL_BT_SCO_TX_QCHAT" value="1" />
@@ -523,13 +596,6 @@
     <!-- ================================================================ -->
     <!-- Device -->
     <!-- RX part -->
-    <path name="sidetone-iir"> 
-        <ctl name="IIR1 Enable Band1" value="1" /> 
-        <ctl name="IIR1 Enable Band2" value="1" /> 
-        <ctl name="IIR1 Enable Band3" value="1" /> 
-        <ctl name="IIR1 Enable Band4" value="1" /> 
-        <ctl name="IIR1 Enable Band5" value="1" /> 
-    </path>
 
     <path name="rcv">
         <ctl name="RX1 MIX1 INP1" value="RX1" />
@@ -537,18 +603,12 @@
         <ctl name="EAR_S" value="Switch" />
     </path>
 
-    <path name="sidetone-handset"> 
-        <path name="sidetone-iir" /> 
-        <ctl name="IIR1 INP1 Volume" value="53" /> 
-        <ctl name="RX1 MIX2 INP1" value="IIR1" /> 
-    </path>
-
     <path name="spk">
         <ctl name="MI2S_RX Channels" value="Two" />
         <ctl name="RX3 MIX1 INP1" value="RX1" />
         <ctl name="RX3 MIX1 INP2" value="RX2" />
         <ctl name="SPK DAC Switch" value="1" />
-    <ctl name="Speaker Boost" value="ENABLE" />
+	<ctl name="Speaker Boost" value="ENABLE" />
     </path>
 
     <path name="ear">
@@ -560,13 +620,6 @@
         <ctl name="HPHR" value="Switch" />
     </path>
 
-    <path name="sidetone-headphone"> 
-        <path name="sidetone-iir" /> 
-        <ctl name="RX1 MIX2 INP1" value="IIR1" /> 
-        <ctl name="RX2 MIX2 INP1" value="IIR1" /> 
-        <ctl name="IIR1 INP1 Volume" value="75" /> 
-    </path> 
-
     <path name="lineout">
         <ctl name="MI2S_RX Channels" value="Two" />
         <ctl name="RX1 MIX1 INP1" value="RX1" />
@@ -603,17 +656,12 @@
     <!-- TX part -->
     <path name="main-mic">
         <ctl name="DEC1 MUX" value="ADC1" />
-	<ctl name="MICBIAS CAPLESS Switch" value="1" />
-    </path>
-
-    <path name="main-mic-sidetone">
-        <ctl name="DEC1 MUX" value="ADC1" />
-        <ctl name="IIR1 INP1 MUX" value="DEC1" /> 
+        <ctl name="MICBIAS CAPLESS Switch" value="0" />
     </path>
 
     <path name="sub-mic">
-        <ctl name="DEC1 MUX" value="ADC2" />
-        <ctl name="ADC2 MUX" value="INP3" />
+        <ctl name="DEC1 MUX" value="ADC1" />
+        <ctl name="MICBIAS CAPLESS Switch" value="1" />
     </path>
 
     <path name="3rd-mic">
@@ -685,19 +733,19 @@
 
     <path name="speaker">
         <path name="spk" />
-        <ctl name="RX3 Digital Volume" value="80" />
+        <ctl name="RX3 Digital Volume" value="82" />
     </path>
 
     <path name="headset">
         <path name="ear" />
-        <ctl name="RX1 Digital Volume" value="83" />
-        <ctl name="RX2 Digital Volume" value="83" />
+        <ctl name="RX1 Digital Volume" value="80" />
+        <ctl name="RX2 Digital Volume" value="80" />
     </path>
 
     <path name="dock">
         <path name="lineout" />
         <ctl name="RX1 Digital Volume" value="83" />
-        <ctl name="RX2 Digital Volume" value="83" />		
+        <ctl name="RX2 Digital Volume" value="83" />
         <ctl name="EAR PA Gain" value="POS_1P5_DB" />	
     </path>
 
@@ -710,9 +758,9 @@
 
     <path name="speaker-and-headphones">
         <path name="spk-ear" />
-        <ctl name="RX1 Digital Volume" value="56" />
-        <ctl name="RX2 Digital Volume" value="56" />
-        <ctl name="RX3 Digital Volume" value="79" />  
+        <ctl name="RX1 Digital Volume" value="62" />
+        <ctl name="RX2 Digital Volume" value="62" />
+        <ctl name="RX3 Digital Volume" value="82" />
         <ctl name="EAR PA Gain" value="POS_1P5_DB" />	
     </path>
 
@@ -734,14 +782,9 @@
         <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" />
+        <ctl name="RX3 Digital Volume" value="77" />
     </path>	
 
     <path name="fm-headset">
@@ -751,20 +794,25 @@
         <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>
+
     <!-- end of Play Scenario -->
 
     <!-- ================================================================ -->
     <!-- Recording Scenario  -->
     <path name="rec-main-mic">
         <path name="main-mic" />
-        <ctl name="DEC1 Volume" value="88" />
+        <ctl name="DEC1 Volume" value="95" />
         <ctl name="ADC1 Volume" value="2" />
     </path>
 
     <path name="rec-sub-mic">
-        <path name="sub-mic" />
-        <ctl name="DEC1 Volume" value="82" />
-        <ctl name="ADC3 Volume" value="4" />
+        <path name="main-mic" />
+        <ctl name="DEC1 Volume" value="89" />
+        <ctl name="ADC1 Volume" value="2" />
     </path>
 
     <path name="rec-headset-mic">
@@ -774,11 +822,7 @@
     </path>
 
     <path name="rec-stereo-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 name="rec-main-mic" />
     </path>
 
     <path name="rec-high-gain-main-mic">
@@ -786,7 +830,7 @@
     </path>
 
     <path name="rec-high-gain-sub-mic">
-        <path name="rec-sub-mic" />
+        <path name="rec-main-mic" />
     </path>
 
     <path name="rec-high-gain-headset-mic">
@@ -794,7 +838,7 @@
     </path>
 
     <path name="rec-high-gain-stereo-mic">
-        <path name="rec-main-mic" />	
+        <path name="rec-main-mic" />
     </path>
 
     <path name="rec-NS-mic-interview">
@@ -828,14 +872,14 @@
     </path>
 
     <path name="vr-sub-mic">
-        <path name="sub-mic" />
-        <ctl name="DEC1 Volume" value="84" />
-        <ctl name="ADC3 Volume" value="4" />
+        <path name="main-mic" />
+        <ctl name="DEC1 Volume" value="80" />
+        <ctl name="ADC1 Volume" value="40" />
     </path>
 
     <path name="vr-headset-mic">
         <path name="ear-mic" />
-        <ctl name="DEC1 Volume" value="82" />
+        <ctl name="DEC1 Volume" value="88" />
         <ctl name="ADC2 Volume" value="4" />
     </path>
 
@@ -846,9 +890,9 @@
     </path>
 
     <path name="bargein1-sub-mic">
-        <path name="sub-mic" />
-        <ctl name="DEC1 Volume" value="103" />
-        <ctl name="ADC3 Volume" value="4" />
+        <path name="main-mic" />
+        <ctl name="DEC1 Volume" value="82" />
+        <ctl name="ADC1 Volume" value="4" />
     </path>
 
     <path name="bargein1-earphone-mic">
@@ -870,9 +914,9 @@
     </path>
 
     <path name="bargein2-sub-mic">
-        <path name="sub-mic" />
-        <ctl name="DEC1 Volume" value="103" />
-        <ctl name="ADC3 Volume" value="4" />
+        <path name="main-mic" />
+        <ctl name="DEC1 Volume" value="82" />
+        <ctl name="ADC1 Volume" value="4" />
     </path>
 
     <path name="bargein2-earphone-mic">
@@ -913,22 +957,22 @@
     <!-- RX part -->
     <path name="voice-call-handset">
         <path name="rcv" />
-        <ctl name="RX1 Digital Volume" value="81" />
+        <ctl name="RX1 Digital Volume" value="80" />
     </path>
 
     <path name="voice-call-handset-extra-vol">
         <path name="rcv" />
-        <ctl name="RX1 Digital Volume" value="81" />
+        <ctl name="RX1 Digital Volume" value="80" />
     </path>
 
     <path name="voice-call-handset-emergency">
         <path name="rcv" />
-        <ctl name="RX1 Digital Volume" value="81" />
+        <ctl name="RX1 Digital Volume" value="80" />
     </path>
 
     <path name="voice-call-handset-hac">
         <path name="rcv" />
-        <ctl name="RX1 Digital Volume" value="81" />
+        <ctl name="RX1 Digital Volume" value="80" />
     </path>
 
     <path name="voice-call-speaker">
@@ -943,15 +987,14 @@
 
     <path name="voice-call-speaker-emergency">
         <path name="spk" />
-        <ctl name="RX3 Digital Volume" value="83" />
+        <ctl name="RX3 Digital Volume" value="84" />
     </path>
 
     <path name="voice-call-headset">
-        <path name="sidetone-headphone" />
         <path name="ear" />
-        <ctl name="RX1 Digital Volume" value="83" />
-        <ctl name="RX2 Digital Volume" value="83" />
-        <ctl name="EAR PA Gain" value="POS_1P5_DB" />	
+        <ctl name="RX1 Digital Volume" value="84" />
+        <ctl name="RX2 Digital Volume" value="84" />
+        <ctl name="EAR PA Gain" value="POS_1P5_DB" />
     </path>
 
     <path name="voice-call-dock">
@@ -971,15 +1014,15 @@
     </path>
 
     <path name="voice-call-sub-mic">
-        <path name="sub-mic" />
-        <ctl name="DEC1 Volume" value="68" />
-        <ctl name="ADC3 Volume" value="4" />
+        <path name="main-mic" />
+        <ctl name="DEC1 Volume" value="84" />
+        <ctl name="ADC1 Volume" value="4" />
     </path>
 
     <path name="voice-call-sub-mic-emergency">
-        <path name="sub-mic" />
-        <ctl name="DEC1 Volume" value="68" />
-        <ctl name="ADC3 Volume" value="4" />
+        <path name="main-mic" />
+        <ctl name="DEC1 Volume" value="84" />
+        <ctl name="ADC1 Volume" value="4" />
     </path>
 
     <path name="voice-call-headphone-mic">
@@ -990,24 +1033,16 @@
 
     <path name="voice-call-headset-mic">
         <path name="ear-mic" />
-        <ctl name="DEC1 Volume" value="86" />
+        <ctl name="DEC1 Volume" value="84" />
         <ctl name="ADC2 Volume" value="4" />
     </path>
 
     <path name="voice-call-NS-mic-handset">
-        <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 name="voice-call-main-mic" />
     </path>
 
     <path name="voice-call-NS-mic-speaker">
-        <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 name="voice-call-main-mic" />
     </path>
     <!-- end of Voice call Scenario  -->
 
@@ -1016,22 +1051,22 @@
     <!-- RX part -->
     <path name="voice-call-cp2-handset">
         <path name="rcv" />
-        <ctl name="RX1 Digital Volume" value="84" />
+        <ctl name="RX1 Digital Volume" value="80" />
     </path>
 
     <path name="voice-call-cp2-handset-extra-vol">
         <path name="rcv" />
-        <ctl name="RX1 Digital Volume" value="84" />
+        <ctl name="RX1 Digital Volume" value="80" />
     </path>
 
     <path name="voice-call-cp2-handset-emergency">
         <path name="rcv" />
-        <ctl name="RX1 Digital Volume" value="84" />
+        <ctl name="RX1 Digital Volume" value="80" />
     </path>
 
     <path name="voice-call-cp2-handset-hac">
         <path name="rcv" />
-        <ctl name="RX1 Digital Volume" value="84" />
+        <ctl name="RX1 Digital Volume" value="80" />
     </path>
 
     <path name="voice-call-cp2-speaker">
@@ -1046,7 +1081,7 @@
 
     <path name="voice-call-cp2-speaker-emergency">
         <path name="spk" />
-        <ctl name="RX3 Digital Volume" value="88" />
+        <ctl name="RX3 Digital Volume" value="84" />
     </path>
 
     <path name="voice-call-cp2-headset">
@@ -1073,15 +1108,15 @@
     </path>
 
     <path name="voice-call-cp2-sub-mic">
-        <path name="sub-mic" />
-        <ctl name="DEC1 Volume" value="68" />
-        <ctl name="ADC3 Volume" value="4" />
+        <path name="main-mic" />
+        <ctl name="DEC1 Volume" value="84" />
+        <ctl name="ADC1 Volume" value="4" />
     </path>
 
     <path name="voice-call-cp2-sub-mic-emergency">
-        <path name="sub-mic" />
-        <ctl name="DEC1 Volume" value="68" />
-        <ctl name="ADC3 Volume" value="4" />
+        <path name="main-mic" />
+        <ctl name="DEC1 Volume" value="84" />
+        <ctl name="ADC1 Volume" value="4" />
     </path>
 
     <path name="voice-call-cp2-headphone-mic">
@@ -1092,7 +1127,7 @@
 
     <path name="voice-call-cp2-headset-mic">
         <path name="ear-mic" />
-        <ctl name="DEC1 Volume" value="100" />
+        <ctl name="DEC1 Volume" value="84" />
         <ctl name="ADC2 Volume" value="4" />
     </path>
 
@@ -1124,7 +1159,7 @@
     <!-- RX part -->
     <path name="video-call-handset">
         <path name="rcv" />
-        <ctl name="RX1 Digital Volume" value="81" />
+        <ctl name="RX1 Digital Volume" value="84" />
     </path>
 
     <path name="video-call-handset-extra-vol">
@@ -1133,7 +1168,7 @@
 
     <path name="video-call-speaker">
         <path name="spk" />
-        <ctl name="RX3 Digital Volume" value="80" />
+        <ctl name="RX3 Digital Volume" value="84" />
     </path>
 
     <path name="video-call-speaker-extra-vol">
@@ -1144,7 +1179,7 @@
         <path name="ear" />
         <ctl name="RX1 Digital Volume" value="84" />
         <ctl name="RX2 Digital Volume" value="84" />
-        <ctl name="EAR PA Gain" value="POS_1P5_DB" />	
+        <ctl name="EAR PA Gain" value="POS_1P5_DB" />
     </path>
 
     <path name="video-call-dock">
@@ -1158,7 +1193,9 @@
     </path>
 
     <path name="video-call-sub-mic">
-        <path name="voice-call-sub-mic" />
+        <path name="main-mic" />
+        <ctl name="DEC1 Volume" value="84" />
+        <ctl name="ADC1 Volume" value="4" />
     </path>
 
     <path name="video-call-headphone-mic">
@@ -1168,25 +1205,21 @@
     </path>
 
     <path name="video-call-headset-mic">
-		<path name="ear-mic" />
+        <path name="ear-mic" />
         <ctl name="DEC1 Volume" value="84" />
         <ctl name="ADC2 Volume" value="4" />
     </path>
 
     <path name="video-call-NS-mic-handset">
-        <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 name="main-mic" />
+        <ctl name="DEC1 Volume" value="84" />
+        <ctl name="ADC1 Volume" value="4" />
     </path>
 
     <path name="video-call-NS-mic-speaker">
-        <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 name="main-mic" />
+        <ctl name="DEC1 Volume" value="84" />
+        <ctl name="ADC1 Volume" value="4" />
     </path>
     <!-- end of Video call Scenario  -->
 
@@ -1195,34 +1228,34 @@
     <!-- RX part -->
     <path name="VoLTE-voice-handset">
         <path name="rcv" />
-        <ctl name="RX1 Digital Volume" value="81" />
+        <ctl name="RX1 Digital Volume" value="84" />
     </path>
 
     <path name="VoLTE-voice-handset-extra-vol">
         <path name="rcv" />
-        <ctl name="RX1 Digital Volume" value="81" />
+        <ctl name="RX1 Digital Volume" value="84" />
     </path>
 
     <path name="VoLTE-voice-handset-hac">
         <path name="rcv" />
-        <ctl name="RX1 Digital Volume" value="81" />
+        <ctl name="RX1 Digital Volume" value="84" />
     </path>
 
     <path name="VoLTE-voice-speaker">
         <path name="spk" />
-        <ctl name="RX3 Digital Volume" value="80" />
+        <ctl name="RX3 Digital Volume" value="84" />
     </path>
 
     <path name="VoLTE-voice-speaker-extra-vol">
         <path name="spk" />
-        <ctl name="RX3 Digital Volume" value="80" />
+        <ctl name="RX3 Digital Volume" value="84" />
     </path>
 
     <path name="VoLTE-voice-headset">
         <path name="ear" />
         <ctl name="RX1 Digital Volume" value="84" />
         <ctl name="RX2 Digital Volume" value="84" />
-        <ctl name="EAR PA Gain" value="POS_1P5_DB" />	
+        <ctl name="EAR PA Gain" value="POS_1P5_DB" />
     </path>
 
     <path name="VoLTE-voice-dock">
@@ -1236,9 +1269,9 @@
     </path>
 
     <path name="VoLTE-voice-sub-mic">
-        <path name="sub-mic" />
-        <ctl name="DEC1 Volume" value="68" />
-        <ctl name="ADC3 Volume" value="4" />
+        <path name="main-mic" />
+        <ctl name="DEC1 Volume" value="84" />
+        <ctl name="ADC1 Volume" value="4" />
     </path>
 
     <path name="VoLTE-voice-headphone-mic">
@@ -1254,19 +1287,15 @@
     </path>
 
     <path name="VoLTE-voice-NS-mic-handset">
-        <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 name="main-mic" />
+        <ctl name="DEC1 Volume" value="84" />
+        <ctl name="ADC1 Volume" value="4" />
     </path>
 
     <path name="VoLTE-voice-NS-mic-speaker">
-        <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 name="main-mic" />
+        <ctl name="DEC1 Volume" value="84" />
+        <ctl name="ADC1 Volume" value="4" />
     </path>
     <!-- end of VoLTE Voice call Scenario  -->
 
@@ -1275,29 +1304,29 @@
     <!-- RX part -->
     <path name="VoLTE-video-handset">
         <path name="rcv" />
-        <ctl name="RX1 Digital Volume" value="81" />
+        <ctl name="RX1 Digital Volume" value="84" />
     </path>
 
     <path name="VoLTE-video-handset-extra-vol">
         <path name="rcv" />
-        <ctl name="RX1 Digital Volume" value="81" />
+        <ctl name="RX1 Digital Volume" value="84" />
     </path>
 
     <path name="VoLTE-video-speaker">
         <path name="spk" />
-        <ctl name="RX3 Digital Volume" value="80" />
+        <ctl name="RX3 Digital Volume" value="84" />
     </path>
 
     <path name="VoLTE-video-speaker-extra-vol">
         <path name="spk" />
-        <ctl name="RX3 Digital Volume" value="80" />
+        <ctl name="RX3 Digital Volume" value="84" />
     </path>
 
     <path name="VoLTE-video-headset">
         <path name="ear" />
         <ctl name="RX1 Digital Volume" value="84" />
         <ctl name="RX2 Digital Volume" value="84" />
-        <ctl name="EAR PA Gain" value="POS_1P5_DB" />	
+        <ctl name="EAR PA Gain" value="POS_1P5_DB" />
     </path>
 
     <path name="VoLTE-video-dock">
@@ -1311,9 +1340,9 @@
     </path>
 
     <path name="VoLTE-video-sub-mic">
-        <path name="sub-mic" />
-        <ctl name="DEC1 Volume" value="68" />
-        <ctl name="ADC3 Volume" value="4" />
+         <path name="main-mic" />
+        <ctl name="DEC1 Volume" value="84" />
+        <ctl name="ADC1 Volume" value="4" />
     </path>
 
     <path name="VoLTE-video-headphone-mic">
@@ -1329,19 +1358,15 @@
     </path>
 
     <path name="VoLTE-video-NS-mic-handset">
-        <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 name="main-mic" />
+        <ctl name="DEC1 Volume" value="84" />
+        <ctl name="ADC1 Volume" value="4" />
     </path>
 
     <path name="VoLTE-video-NS-mic-speaker">
-        <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 name="main-mic" />
+        <ctl name="DEC1 Volume" value="84" />
+        <ctl name="ADC1 Volume" value="4" />
     </path>
     <!-- end of VoLTE Video call Scenario  -->
 
@@ -1362,14 +1387,14 @@
         <path name="ear" />
         <ctl name="RX1 Digital Volume" value="86" />
         <ctl name="RX2 Digital Volume" value="86" />
-        <ctl name="EAR PA Gain" value="POS_1P5_DB" />	
+        <ctl name="EAR PA Gain" value="POS_1P5_DB" />
     </path>
 
     <path name="TTY-full">
         <path name="ear" />
         <ctl name="RX1 Digital Volume" value="86" />
         <ctl name="RX2 Digital Volume" value="86" />
-        <ctl name="EAR PA Gain" value="POS_1P5_DB" />	
+        <ctl name="EAR PA Gain" value="POS_1P5_DB" />
     </path>
 
     <!-- TX part -->
@@ -1377,21 +1402,18 @@
         <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 -->
 
@@ -1405,7 +1427,7 @@
 
     <path name="voip-speaker-comm">
         <path name="spk" />
-        <ctl name="RX3 Digital Volume" value="82" />
+        <ctl name="RX3 Digital Volume" value="80" />
     </path>
 
     <path name="voip-headset-comm">
@@ -1429,7 +1451,7 @@
         <path name="ear" />
         <ctl name="RX1 Digital Volume" value="86" />
         <ctl name="RX2 Digital Volume" value="86" />
-        <ctl name="EAR PA Gain" value="POS_1P5_DB" />	
+        <ctl name="EAR PA Gain" value="POS_1P5_DB" />
     </path>
 
     <path name="voip-handset-chaton">
@@ -1446,7 +1468,7 @@
         <path name="ear" />
         <ctl name="RX1 Digital Volume" value="86" />
         <ctl name="RX2 Digital Volume" value="86" />
-        <ctl name="EAR PA Gain" value="POS_1P5_DB" />	
+        <ctl name="EAR PA Gain" value="POS_1P5_DB" />
     </path>
 
     <path name="voip-handset-callforwarding">
@@ -1463,7 +1485,7 @@
         <path name="ear" />
         <ctl name="RX1 Digital Volume" value="86" />
         <ctl name="RX2 Digital Volume" value="86" />
-        <ctl name="EAR PA Gain" value="POS_1P5_DB" />	
+        <ctl name="EAR PA Gain" value="POS_1P5_DB" />
     </path>
 
     <path name="voip-handset-webex">
@@ -1480,7 +1502,7 @@
         <path name="ear" />
         <ctl name="RX1 Digital Volume" value="86" />
         <ctl name="RX2 Digital Volume" value="86" />
-        <ctl name="EAR PA Gain" value="POS_1P5_DB" />	
+        <ctl name="EAR PA Gain" value="POS_1P5_DB" />
     </path>
 
     <path name="voip-handset-carrier">
@@ -1497,7 +1519,7 @@
         <path name="ear" />
         <ctl name="RX1 Digital Volume" value="86" />
         <ctl name="RX2 Digital Volume" value="86" />
-        <ctl name="EAR PA Gain" value="POS_1P5_DB" />	
+        <ctl name="EAR PA Gain" value="POS_1P5_DB" />
     </path>
 
     <path name="voip-handset-nonpcm">
@@ -1514,7 +1536,7 @@
         <path name="ear" />
         <ctl name="RX1 Digital Volume" value="86" />
         <ctl name="RX2 Digital Volume" value="86" />
-        <ctl name="EAR PA Gain" value="POS_1P5_DB" />	
+        <ctl name="EAR PA Gain" value="POS_1P5_DB" />
     </path>
 
     <!-- TX part -->
@@ -1525,21 +1547,21 @@
     </path>
 
     <path name="voip-sub-mic-comm">
-        <path name="sub-mic" />
-        <ctl name="DEC1 Volume" value="68" />
-        <ctl name="ADC3 Volume" value="4" />
+        <path name="main-mic" />
+        <ctl name="DEC1 Volume" value="84" />
+        <ctl name="ADC1 Volume" value="4" />
     </path>
 
     <path name="voip-headphone-mic-comm">
         <path name="main-mic" />
         <ctl name="DEC1 Volume" value="84" />
-        <ctl name="ADC1 Volume" value="14" />
+        <ctl name="ADC1 Volume" value="4" />
     </path>
 
     <path name="voip-headset-mic-comm">
         <path name="ear-mic" />
         <ctl name="DEC1 Volume" value="84" />
-        <ctl name="ADC2 Volume" value="14" />
+        <ctl name="ADC2 Volume" value="4" />
     </path>
 
     <path name="voip-main-mic-others">
@@ -1549,9 +1571,9 @@
     </path>
 
     <path name="voip-sub-mic-others">
-        <path name="sub-mic" />
-        <ctl name="DEC1 Volume" value="68" />
-        <ctl name="ADC3 Volume" value="4" />
+        <path name="main-mic" />
+        <ctl name="DEC1 Volume" value="84" />
+        <ctl name="ADC1 Volume" value="4" />
     </path>
 
     <path name="voip-headphone-mic-others">
@@ -1573,13 +1595,15 @@
     </path>
 
     <path name="voip-sub-mic-chaton">
-        <path name="sub-main-mic" />
+        <path name="main-mic" />
+        <ctl name="DEC1 Volume" value="84" />
+        <ctl name="ADC1 Volume" value="4" />
     </path>
 
     <path name="voip-headphone-mic-chaton">
-        <path name="ear-mic" />
+         <path name="main-mic" />
         <ctl name="DEC1 Volume" value="84" />
-        <ctl name="ADC2 Volume" value="4" />
+        <ctl name="ADC1 Volume" value="4" />
     </path>
 
     <path name="voip-headset-mic-chaton">
@@ -1595,15 +1619,15 @@
     </path>
 
     <path name="voip-sub-mic-callforwarding">
-        <path name="sub-mic" />
-        <ctl name="DEC1 Volume" value="68" />
-        <ctl name="ADC3 Volume" value="4" />
+        <path name="main-mic" />
+        <ctl name="DEC1 Volume" value="84" />
+        <ctl name="ADC1 Volume" value="4" />
     </path>
 
     <path name="voip-headphone-mic-callforwarding">
-        <path name="ear-mic" />
+        <path name="main-mic" />
         <ctl name="DEC1 Volume" value="84" />
-        <ctl name="ADC2 Volume" value="4" />
+        <ctl name="ADC1 Volume" value="4" />
     </path>
 
     <path name="voip-headset-mic-callforwarding">
@@ -1619,15 +1643,15 @@
     </path>
 
     <path name="voip-sub-mic-webex">
-        <path name="sub-mic" />
-        <ctl name="DEC1 Volume" value="68" />
-        <ctl name="ADC3 Volume" value="4" />
+        <path name="main-mic" />
+        <ctl name="DEC1 Volume" value="84" />
+        <ctl name="ADC1 Volume" value="4" />
     </path>
 
     <path name="voip-headphone-mic-webex">
-        <path name="ear-mic" />
+        <path name="main-mic" />
         <ctl name="DEC1 Volume" value="84" />
-        <ctl name="ADC2 Volume" value="4" />
+        <ctl name="ADC1 Volume" value="4" />
     </path>
 
     <path name="voip-headset-mic-webex">
@@ -1637,17 +1661,15 @@
     </path>
 
     <path name="voip-main-mic-carrier">
-        <path name="main-sub-mic" />
+        <path name="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>
 
     <path name="voip-sub-mic-carrier">
-        <path name="sub-mic" />
-        <ctl name="DEC1 Volume" value="68" />
-        <ctl name="ADC3 Volume" value="4" />
+        <path name="main-mic" />
+        <ctl name="DEC1 Volume" value="84" />
+        <ctl name="ADC1 Volume" value="4" />
     </path>
 
     <path name="voip-headphone-mic-carrier">
@@ -1669,9 +1691,9 @@
     </path>
 
     <path name="voip-sub-mic-nonpcm">
-        <path name="sub-mic" />
-        <ctl name="DEC1 Volume" value="68" />
-        <ctl name="ADC3 Volume" value="4" />
+        <path name="main-mic" />
+        <ctl name="DEC1 Volume" value="84" />
+        <ctl name="ADC1 Volume" value="4" />
     </path>
 
     <path name="voip-headphone-mic-nonpcm">
@@ -1692,7 +1714,7 @@
     <!-- RX part -->
     <path name="loopback-handset-DSP">
         <path name="rcv" />
-        <ctl name="RX1 Digital Volume" value="84" />
+        <ctl name="RX1 Digital Volume" value="94" />
     </path>
 
     <path name="loopback-handset-2mic-on-DSP">
@@ -1707,8 +1729,8 @@
 
     <path name="loopback-headset-DSP">
         <path name="ear" />
-        <ctl name="RX1 Digital Volume" value="84" />
-        <ctl name="RX2 Digital Volume" value="84" />
+        <ctl name="RX1 Digital Volume" value="86" />
+        <ctl name="RX2 Digital Volume" value="86" />
         <ctl name="EAR PA Gain" value="POS_1P5_DB" />	
     </path>
 
@@ -1738,7 +1760,7 @@
     <path name="loopback-main-mic-DSP">
         <path name="main-mic" />
         <ctl name="ADC1 Volume" value="10" />
-        <ctl name="DEC1 Volume" value="81" />
+        <ctl name="DEC1 Volume" value="85" />
     </path>
 
     <path name="loopback-main-mic-2mic-on-DSP">
@@ -1748,9 +1770,9 @@
     </path>
 
     <path name="loopback-sub-mic-DSP">
-        <path name="sub-mic" />
-        <ctl name="ADC3 Volume" value="4" />
-        <ctl name="DEC1 Volume" value="69" />
+        <path name="main-mic" />
+        <ctl name="ADC1 Volume" value="10" />
+        <ctl name="DEC1 Volume" value="81" />
     </path>
 
     <path name="loopback-3rd-mic-DSP">
@@ -1782,9 +1804,9 @@
     </path>
 
     <path name="loopback-sub-mic">
-        <path name="sub-mic" />
-        <ctl name="DEC1 Volume" value="68" />
-        <ctl name="ADC3 Volume" value="4" />
+        <path name="main-mic" />
+        <ctl name="ADC1 Volume" value="4" />
+        <ctl name="DEC1 Volume" value="69" />
     </path>
 
     <path name="loopback-3rd-mic">
@@ -1864,7 +1886,9 @@
     </path>
 
     <path name="loopback-cp2-sub-mic-DSP">
-        <path name="loopback-sub-mic-DSP" />
+        <path name="main-mic" />
+        <ctl name="ADC1 Volume" value="4" />
+        <ctl name="DEC1 Volume" value="69" />
     </path>
 
     <path name="loopback-cp2-3rd-mic-DSP">
@@ -1896,9 +1920,9 @@
     </path>
 
     <path name="loopback-cp2-sub-mic">
-        <path name="sub-mic" />
-        <ctl name="DEC1 Volume" value="68" />
-        <ctl name="ADC3 Volume" value="4" />
+        <path name="main-mic" />
+        <ctl name="ADC1 Volume" value="4" />
+        <ctl name="DEC1 Volume" value="69" />
     </path>
 
     <path name="loopback-cp2-3rd-mic">
diff --git a/device.mk b/device.mk
index 16ed337..fcd49fd 100644
--- a/device.mk
+++ b/device.mk
@@ -1,21 +1,20 @@
 #Inherit from vendor
-$(call inherit-product, vendor/samsung/gprimelte/gprimelte-vendor.mk)
+$(call inherit-product, vendor/samsung/j53gxx/j53gxx-vendor.mk)
 
 # Inherit from common
-$(call inherit-product, device/samsung/gprimelte-common/device-common.mk)
+$(call inherit-product, device/samsung/j5-common/device-common.mk)
 
-LOCAL_PATH := device/samsung/gprimelte
+LOCAL_PATH := device/samsung/j53gxx
 
 # System properties
 -include $(LOCAL_PATH)/system_prop.mk
 
 # Common overlay
-DEVICE_PACKAGE_OVERLAYS += device/samsung/gprimelte/overlay
+DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
 
 # Audio configuration
 PRODUCT_COPY_FILES += \
-	$(LOCAL_PATH)/audio/base/mixer_paths.xml:system/etc/mixer_paths.xml \
-	$(LOCAL_PATH)/audio/spr/mixer_paths.xml:system/blobs/spr/etc/mixer_paths.xml
+	$(LOCAL_PATH)/audio/mixer_paths.xml:system/etc/mixer_paths.xml
 
 # Media configurations
 PRODUCT_COPY_FILES += \
@@ -23,8 +22,3 @@
 	$(LOCAL_PATH)/media/media_codecs_8939.xml:system/etc/media_codecs_8939.xml \
 	$(LOCAL_PATH)/media/media_codecs.xml:system/etc/media_codecs.xml \
 	$(LOCAL_PATH)/media/media_profiles.xml:system/etc/media_profiles.xml
-
-# Copy baseband firmware
-$(call inherit-product-if-exists, vendor/samsung/radio/G530T1UVS2AQA2/baseband.mk)
-$(call inherit-product-if-exists, vendor/samsung/radio/G530TUVS2AQA2/baseband.mk)
-$(call inherit-product-if-exists, vendor/samsung/radio/G530WVLS2AQB2/baseband.mk)
diff --git a/lineage.mk b/lineage.mk
index aecce55..fff2e2a 100644
--- a/lineage.mk
+++ b/lineage.mk
@@ -1,14 +1,14 @@
 
 # Inherit from common
-$(call inherit-product, device/samsung/gprimelte-common/lineage.mk)
+$(call inherit-product, device/samsung/j5-common/lineage.mk)
 
-$(call inherit-product, device/samsung/gprimelte/device.mk)
+$(call inherit-product, device/samsung/j53gxx/device.mk)
 
 ## Device identifier. This must come after all inclusions
-PRODUCT_DEVICE := gprimelte
-PRODUCT_NAME := lineage_gprimelte
+PRODUCT_DEVICE := j53gxx
+PRODUCT_NAME := lineage_j53gxx
 PRODUCT_BRAND := samsung
-PRODUCT_MODEL := SM-G530W
+PRODUCT_MODEL := SM-J500H
 PRODUCT_MANUFACTURER := samsung
 PRODUCT_CHARACTERISTICS := phone
 
diff --git a/local_manifest/local_manifest.xml b/local_manifest/local_manifest.xml
deleted file mode 100644
index 5614f9b..0000000
--- a/local_manifest/local_manifest.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-  
-  
-  <project path="bootable/recovery-twrp" name="omnirom/android_bootable_recovery" remote="github" revision="android-5.1"/>
-  <project path="device/samsung/gprimelte-common" name="vince2678/android_device_samsung_gprimelte-common" groups="device" remote="github" revision="cm-12.1"/>
-  <project path="device/samsung/gprimeltecan" name="vince2678/android_device_samsung_gprimeltecan" groups="device" remote="github" revision="cm-12.1"/>
-  <project path="device/qcom-common" name="vince2678/android_device_qcom-common" remote="github" revision="cm-12.1"/>
-  <project path="vendor/samsung/gprimeltecan" name="vince2678/android_vendor_samsung_gprimeltecan" remote="github" revision="cm-12.1"/>
-  <project path="vendor/samsung/common" name="vince2678/android_vendor_samsung_common" remote="github" revision="cm-12.1"/>
-  <project path="android/external/iwconfig" name="vince2678/android_external_iwconfig" remote="github" revision="cm-12.1"/>
-  <project path="kernel/samsung/grandprime" name="vince2678/android_kernel_samsung_grandprime" remote="github" revision="cm-12.1"/>
-  <project path="device/samsung/qcom-common" name="CyanogenMod/android_device_samsung_qcom-common" groups="device" />
-  <project path="hardware/qcom/fm" name="CyanogenMod/android_hardware_qcom_fm" />
-</manifest>
diff --git a/media/media_codecs.xml b/media/media_codecs.xml
index d34966e..408568d 100644
--- a/media/media_codecs.xml
+++ b/media/media_codecs.xml
@@ -110,51 +110,6 @@
 -->
 <MediaCodecs>
     <Encoders>
-        <!-- Video Hardware  -->
-        <MediaCodec name="OMX.qcom.video.encoder.mpeg4" type="video/mp4v-es" >
-            <Quirk name="requires-allocate-on-input-ports" />
-            <Quirk name="requires-allocate-on-output-ports"/>
-            <Quirk name="requires-loaded-to-idle-after-allocation"/>
-            <Limit name="size" min="96x64" max="1920x1088" />
-            <Limit name="alignment" value="2x2" />
-            <Limit name="block-size" value="16x16" />
-            <Limit name="blocks-per-second" min="1" max="244800" />
-            <Limit name="bitrate" range="1-20000000" />
-            <Quirk name="video-controller-check-enable" />
-        </MediaCodec>
-        <MediaCodec name="OMX.qcom.video.encoder.h263" type="video/3gpp" >
-            <Quirk name="requires-allocate-on-input-ports" />
-            <Quirk name="requires-allocate-on-output-ports"/>
-            <Quirk name="requires-loaded-to-idle-after-allocation"/>
-            <Limit name="size" min="96x64" max="720x576" />
-            <Limit name="alignment" value="2x2" />
-            <Limit name="block-size" value="16x16" />
-            <Limit name="blocks-per-second" min="1" max="48600" />
-            <Limit name="bitrate" range="1-2000000" />
-            <Quirk name="video-controller-check-enable" />
-        </MediaCodec>
-        <MediaCodec name="OMX.qcom.video.encoder.avc" type="video/avc" >
-            <Quirk name="requires-allocate-on-input-ports" />
-            <Quirk name="requires-allocate-on-output-ports"/>
-            <Quirk name="requires-loaded-to-idle-after-allocation"/>
-            <Limit name="size" min="96x64" max="1920x1088" />
-            <Limit name="alignment" value="2x2" />
-            <Limit name="block-size" value="16x16" />
-            <Limit name="blocks-per-second" min="1" max="244800" />
-            <Limit name="bitrate" range="1-20000000" />
-            <Quirk name="video-controller-check-enable" />
-        </MediaCodec>
-        <MediaCodec name="OMX.qcom.video.encoder.vp8" type="video/x-vnd.on2.vp8" >
-            <Quirk name="requires-allocate-on-input-ports" />
-            <Quirk name="requires-allocate-on-output-ports"/>
-            <Quirk name="requires-loaded-to-idle-after-allocation"/>
-            <Limit name="size" min="96x64" max="1920x1088" />
-            <Limit name="alignment" value="2x2" />
-            <Limit name="block-size" value="16x16" />
-            <Limit name="blocks-per-second" min="1" max="244800" />
-            <Limit name="bitrate" range="1-20000000" />
-            <Quirk name="video-controller-check-enable" />
-        </MediaCodec>
         <!-- Audio Hardware  -->
         <MediaCodec name="OMX.qcom.audio.encoder.evrc" type="audio/evrc" >
             <Quirk name="requires-allocate-on-input-ports" />
@@ -164,6 +119,52 @@
             <Quirk name="requires-allocate-on-input-ports" />
             <Quirk name="requires-allocate-on-output-ports" />
         </MediaCodec>
+        <!-- Audio Software  -->
+        <!-- Video Hardware  -->
+        <MediaCodec name="OMX.qcom.video.encoder.avc" type="video/avc" >
+            <Quirk name="requires-allocate-on-input-ports" />
+            <Quirk name="requires-allocate-on-output-ports" />
+            <Quirk name="video-controller-check-enable" />
+            <Quirk name="requires-loaded-to-idle-after-allocation"/>
+            <Limit name="size" min="96x64" max="1920x1088" />
+            <Limit name="alignment" value="2x2" />
+            <Limit name="block-size" value="16x16" />
+            <Limit name="blocks-per-second" min="1" max="244800" />
+            <Limit name="bitrate" range="1-20000000" />
+        </MediaCodec>
+        <MediaCodec name="OMX.qcom.video.encoder.mpeg4" type="video/mp4v-es" >
+            <Quirk name="requires-allocate-on-input-ports" />
+            <Quirk name="requires-allocate-on-output-ports"/>
+            <Quirk name="video-controller-check-enable" />
+            <Quirk name="requires-loaded-to-idle-after-allocation"/>
+            <Limit name="size" min="96x64" max="1920x1088" />
+            <Limit name="alignment" value="2x2" />
+            <Limit name="block-size" value="16x16" />
+            <Limit name="blocks-per-second" min="1" max="244800" />
+            <Limit name="bitrate" range="1-20000000" />
+        </MediaCodec>
+        <MediaCodec name="OMX.qcom.video.encoder.h263" type="video/3gpp" >
+            <Quirk name="requires-allocate-on-input-ports" />
+            <Quirk name="requires-allocate-on-output-ports"/>
+            <Quirk name="video-controller-check-enable" />
+            <Quirk name="requires-loaded-to-idle-after-allocation"/>
+            <Limit name="size" min="96x64" max="720x576" />
+            <Limit name="alignment" value="2x2" />
+            <Limit name="block-size" value="16x16" />
+            <Limit name="blocks-per-second" min="1" max="48600" />
+            <Limit name="bitrate" range="1-2000000" />
+        </MediaCodec>
+        <MediaCodec name="OMX.qcom.video.encoder.vp8" type="video/x-vnd.on2.vp8" >
+            <Quirk name="requires-allocate-on-input-ports" />
+            <Quirk name="requires-allocate-on-output-ports" />
+            <Quirk name="video-controller-check-enable" />
+            <Quirk name="requires-loaded-to-idle-after-allocation" />
+            <Limit name="size" min="96x64" max="1920x1088" />
+            <Limit name="alignment" value="2x2" />
+            <Limit name="block-size" value="16x16" />
+            <Limit name="blocks-per-second" min="1" max="244800" />
+            <Limit name="bitrate" range="1-20000000" />
+        </MediaCodec>
     </Encoders>
     <Decoders>
         <!-- Audio Software  -->
@@ -188,10 +189,6 @@
             <Quirk name="needs-flush-before-disable" />
             <Quirk name="decoder-ignores-streamcorrupt-error" />
         </MediaCodec>
-        <MediaCodec name="OMX.SEC.wma.dec" type="audio/x-ms-wma" >
-        <Quirk name="needs-flush-before-disable" />
-            <Quirk name="decoder-ignores-streamcorrupt-error" />
-        </MediaCodec>
         <MediaCodec name="OMX.SEC.adpcm.dec" type="audio/x-ima" >
         <Quirk name="needs-flush-before-disable" />
             <Quirk name="decoder-ignores-streamcorrupt-error" />
@@ -236,8 +233,8 @@
             <Limit name="blocks-per-second" min="1" max="244800" />
             <Limit name="bitrate" range="1-20000000" />
             <Feature name="adaptive-playback" />
-            <Feature name="secure-playback" required="true" />
-        </MediaCodec>        
+	        <Feature name="secure-playback" required="true" />
+        </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.mpeg4" type="video/mp4v-es" >
             <Quirk name="requires-allocate-on-input-ports" />
             <Quirk name="requires-allocate-on-output-ports" />
@@ -247,7 +244,7 @@
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
             <Limit name="blocks-per-second" min="1" max="244800" />
-            <Limit name="bitrate" range="1-20000000" />            
+            <Limit name="bitrate" range="1-20000000" />
             <Feature name="adaptive-playback" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.h263" type="video/3gpp" >
@@ -259,56 +256,9 @@
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
             <Limit name="blocks-per-second" min="1" max="48600" />
-            <Limit name="bitrate" range="1-2000000" />            
+            <Limit name="bitrate" range="1-2000000" />
             <Feature name="adaptive-playback" />
         </MediaCodec>
-        <MediaCodec name="OMX.qcom.video.decoder.vc1" >
-            <Type name="video/x-ms-wmv"/>
-            <Type name="video/wvc1"/>
-            <Quirk name="requires-allocate-on-input-ports" />
-            <Quirk name="requires-allocate-on-output-ports" />
-            <Quirk name="requires-timestamp-reorder" />
-            <Quirk name="video-controller-check-enable" />
-            <Limit name="size" min="64x64" max="1920x1088" />
-            <Limit name="alignment" value="2x2" />
-            <Limit name="block-size" value="16x16" />
-            <Limit name="blocks-per-second" min="1" max="244800" />
-            <Limit name="bitrate" range="1-20000000" />            
-            <Feature name="adaptive-playback" />
-        </MediaCodec>
-<!-- QCom DivX Components are not used -->
-<!--   	
-        <MediaCodec name="OMX.qcom.video.decoder.divx" type="video/divx" >
-            <Quirk name="requires-allocate-on-input-ports" />
-            <Quirk name="requires-allocate-on-output-ports" />
-            <Limit name="size" min="64x64" max="1920x1088" />
-            <Limit name="alignment" value="2x2" />
-            <Limit name="block-size" value="16x16" />
-            <Limit name="blocks-per-second" min="1" max="244800" />
-            <Limit name="bitrate" range="1-50000000" />
-            <Feature name="adaptive-playback" />
-        </MediaCodec>
-        <MediaCodec name="OMX.qcom.video.decoder.divx311" type="video/divx311" >
-            <Quirk name="requires-allocate-on-input-ports" />
-            <Quirk name="requires-allocate-on-output-ports" />
-            <Limit name="size" min="64x64" max="1920X1088" />
-            <Limit name="alignment" value="2x2" />
-            <Limit name="block-size" value="16x16" />
-            <Limit name="blocks-per-second" min="1" max="244800" />
-            <Limit name="bitrate" range="1-20000000" />
-            <Feature name="adaptive-playback" />
-        </MediaCodec>
-        <MediaCodec name="OMX.qcom.video.decoder.divx4" type="video/divx4" >
-            <Quirk name="requires-allocate-on-input-ports" />
-            <Quirk name="requires-allocate-on-output-ports" />
-            <Limit name="size" min="64x64" max="1920x1088" />
-            <Limit name="alignment" value="2x2" />
-            <Limit name="block-size" value="16x16" />
-            <Limit name="blocks-per-second" min="1" max="244800" />
-            <Limit name="bitrate" range="1-50000000" />
-            <Feature name="adaptive-playback" />
-        </MediaCodec>
--->
         <MediaCodec name="OMX.qcom.video.decoder.vp8" type="video/x-vnd.on2.vp8" >
             <Quirk name="requires-allocate-on-input-ports" />
             <Quirk name="requires-allocate-on-output-ports" />
@@ -318,24 +268,10 @@
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
             <Limit name="blocks-per-second" min="1" max="244800" />
-            <Limit name="bitrate" range="1-20000000" />            
+            <Limit name="bitrate" range="1-20000000" />
             <Feature name="adaptive-playback" />
         </MediaCodec>
-        <!--
-        <MediaCodec name="OMX.qcom.video.decoder.hevcswvdec" type="video/hevc" >
-            <Quirk name="requires-allocate-on-input-ports" />
-            <Quirk name="requires-allocate-on-output-ports" />
-            <Quirk name="requires-timestamp-reorder" />
-            <Quirk name="video-controller-check-enable" />
-            <Limit name="size" min="64x64" max="1280x720" />
-            <Limit name="alignment" value="2x2" />
-            <Limit name="block-size" value="16x16" />
-            <Limit name="blocks-per-second" min="1" max="108300" />
-            <Limit name="bitrate" range="1-3000000" />
-            <Feature name="adaptive-playback" />        
-        </MediaCodec>
-        -->
-        <!-- Video Software  -->
+        <!-- Video Software -->
         <MediaCodec name="OMX.SEC.h263.sw.dec" type="video/3gpp" >
             <Quirk name="decoder-ignores-streamcorrupt-error" />
         </MediaCodec>
@@ -347,39 +283,18 @@
         <MediaCodec name="OMX.SEC.mpeg4.sw.dec" type="video/mp4v-es" >
             <Quirk name="decoder-ignores-streamcorrupt-error" />
         </MediaCodec>
-        <MediaCodec name="OMX.SEC.vc1.sw.dec" >
-            <Type name="video/x-ms-wmv"/>
-            <Type name="video/wvc1"/>
-            <Quirk name="decoder-ignores-streamcorrupt-error" />
-        </MediaCodec>
-        <MediaCodec name="OMX.SEC.wmv7.dec" type="video/x-ms-wmv7" >
-            <Quirk name="decoder-ignores-streamcorrupt-error" />
-        </MediaCodec>
-        <MediaCodec name="OMX.SEC.wmv8.dec" type="video/x-ms-wmv8" >
-            <Quirk name="decoder-ignores-streamcorrupt-error" />
-        </MediaCodec>
-        <MediaCodec name="OMX.SEC.mp43.dec" type="video/mp43" >
-        <Quirk name="decoder-ignores-streamcorrupt-error" />
-        </MediaCodec>
         <MediaCodec name="OMX.SEC.hevc.sw.dec" type="video/hevc" >
             <Quirk name="decoder-ignores-streamcorrupt-error" />
             <Limit name="size" min="64x64" max="2048x2048" />
-            <Feature name="adaptive-playback" />
+        <Feature name="adaptive-playback" />
         </MediaCodec>
         <MediaCodec name="OMX.SEC.vp8.dec" type="video/x-vnd.on2.vp8" >
             <Quirk name="decoder-ignores-streamcorrupt-error" />
             <Limit name="size" min="64x64" max="2048x2048" />
-            <Feature name="adaptive-playback" />
-        </MediaCodec>
+        <Feature name="adaptive-playback" />
+    </MediaCodec>
     </Decoders>
-    <Include href="media_codecs_google_video.xml" />
     <Include href="media_codecs_google_audio.xml" />
     <Include href="media_codecs_google_telephony.xml" />
-    <Encoders>
-        <MediaCodec name="OMX.SEC.naac.enc" type="audio/mp4a-latm">
-            <Limit name="channel-count" max="6" />
-            <Limit name="sample-rate" ranges="11025,12000,16000,22050,24000,32000,44100,48000" />
-            <Limit name="bitrate" range="8000-960000" />
-        </MediaCodec>
-    </Encoders>
+    <Include href="media_codecs_google_video.xml" />
 </MediaCodecs>
diff --git a/media/media_codecs_8929.xml b/media/media_codecs_8929.xml
index 03f8bf1..579d94e 100644
--- a/media/media_codecs_8929.xml
+++ b/media/media_codecs_8929.xml
@@ -109,8 +109,6 @@
   |____________________________________________________|
 -->
 <MediaCodecs>
-    <Include href="media_codecs_google_audio.xml" />
-    <Include href="media_codecs_google_telephony.xml" />
     <Encoders>
         <!-- Audio Hardware  -->
         <MediaCodec name="OMX.qcom.audio.encoder.evrc" type="audio/evrc" >
@@ -126,6 +124,7 @@
         <MediaCodec name="OMX.qcom.video.encoder.avc" type="video/avc" >
             <Quirk name="requires-allocate-on-input-ports" />
             <Quirk name="requires-allocate-on-output-ports" />
+            <Quirk name="video-controller-check-enable" />
             <Quirk name="requires-loaded-to-idle-after-allocation" />
             <Limit name="size" min="96x64" max="1920x1088" />
             <Limit name="alignment" value="2x2" />
@@ -136,6 +135,7 @@
         <MediaCodec name="OMX.qcom.video.encoder.mpeg4" type="video/mp4v-es" >
             <Quirk name="requires-allocate-on-input-ports" />
             <Quirk name="requires-allocate-on-output-ports" />
+            <Quirk name="video-controller-check-enable" />
             <Quirk name="requires-loaded-to-idle-after-allocation"/>
             <Limit name="size" min="96x64" max="1920x1088" />
             <Limit name="alignment" value="2x2" />
@@ -146,6 +146,7 @@
         <MediaCodec name="OMX.qcom.video.encoder.h263" type="video/3gpp" >
             <Quirk name="requires-allocate-on-input-ports" />
             <Quirk name="requires-allocate-on-output-ports" />
+            <Quirk name="video-controller-check-enable" />
             <Quirk name="requires-loaded-to-idle-after-allocation" />
             <Limit name="size" min="96x64" max="720x576" />
             <Limit name="alignment" value="2x2" />
@@ -156,6 +157,7 @@
         <MediaCodec name="OMX.qcom.video.encoder.vp8" type="video/x-vnd.on2.vp8" >
             <Quirk name="requires-allocate-on-input-ports" />
             <Quirk name="requires-allocate-on-output-ports" />
+            <Quirk name="video-controller-check-enable" />
             <Quirk name="requires-loaded-to-idle-after-allocation" />
             <Limit name="size" min="96x64" max="1920x1088" />
             <Limit name="alignment" value="2x2" />
@@ -165,21 +167,42 @@
         </MediaCodec>
     </Encoders>
     <Decoders>
+        <!-- Audio Software  -->
+        <MediaCodec name="OMX.SEC.amr.dec">
+            <Type name="audio/amr-wb" />
+            <Type name="audio/3gpp"  />
+            <Quirk name="needs-flush-before-disable" />
+            <Quirk name="decoder-ignores-streamcorrupt-error" />
+        </MediaCodec>
+        <MediaCodec name="OMX.SEC.mp3.dec">
+            <Type name="audio/mpeg"/>
+            <Type name="audio/mpeg-L1"/>
+            <Type name="audio/mpeg-L2"/>
+            <Quirk name="needs-flush-before-disable" />
+            <Quirk name="decoder-ignores-streamcorrupt-error" />
+        </MediaCodec>
+        <MediaCodec name="OMX.SEC.aac.dec" type="audio/mp4a-latm" >
+            <Quirk name="needs-flush-before-disable" />
+            <Quirk name="decoder-ignores-streamcorrupt-error" />
+        </MediaCodec>
+        <MediaCodec name="OMX.SEC.flac.dec" type="audio/flac" >
+            <Quirk name="needs-flush-before-disable" />
+            <Quirk name="decoder-ignores-streamcorrupt-error" />
+        </MediaCodec>
+        <MediaCodec name="OMX.SEC.adpcm.dec" type="audio/x-ima" >
+        <Quirk name="needs-flush-before-disable" />
+            <Quirk name="decoder-ignores-streamcorrupt-error" />
+        </MediaCodec>
         <!-- Audio Hardware  -->
-        <MediaCodec name="OMX.qcom.audio.decoder.wma" type="audio/x-ms-wma" >
-            <Quirk name="requires-global-flush" />
-            <Quirk name="requires-wma-pro-component" />
-        </MediaCodec>
-        <MediaCodec name="OMX.qcom.audio.decoder.wmaLossLess" type="audio/x-ms-wma-lossless" >
-            <Quirk name="requires-global-flush" />
-        </MediaCodec>
-        <MediaCodec name="OMX.qcom.audio.decoder.wma10Pro" type="audio/x-ms-wma-pro" >
-            <Quirk name="requires-global-flush" />
-        </MediaCodec>
         <MediaCodec name="OMX.qcom.audio.decoder.amrwbplus" type="audio/amr-wb-plus" >
         </MediaCodec>
         <!-- Audio Software  -->
-        <MediaCodec name="OMX.google.aac.decoder" type="audio/mp4a-latm" />
+        <!--
+            Use Google's RAW decoder to support ACodec path for FLAC clips as
+            FLACDecoder is non-OMX component based. A component can be used to
+            support several mimetypes, so existing raw decoder usecases will not
+            be affected by this.
+        -->
         <MediaCodec name="OMX.qcom.audio.decoder.Qcelp13" type="audio/qcelp" >
             <Quirk name="requires-global-flush" />
         </MediaCodec>
@@ -190,6 +213,8 @@
         <MediaCodec name="OMX.qcom.video.decoder.avc" type="video/avc" >
             <Quirk name="requires-allocate-on-input-ports" />
             <Quirk name="requires-allocate-on-output-ports" />
+            <Quirk name="requires-timestamp-reorder" />
+            <Quirk name="video-controller-check-enable" />            
             <Limit name="size" min="64x64" max="1920x1088" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
@@ -200,27 +225,8 @@
         <MediaCodec name="OMX.qcom.video.decoder.avc.secure" type="video/avc" >
             <Quirk name="requires-allocate-on-input-ports" />
             <Quirk name="requires-allocate-on-output-ports" />
-            <Limit name="size" min="64x64" max="1920x1088" />
-            <Limit name="alignment" value="2x2" />
-            <Limit name="block-size" value="16x16" />
-            <Limit name="blocks-per-second" min="1" max="244800" />
-            <Limit name="bitrate" range="1-20000000" />
-            <Feature name="adaptive-playback" />
-            <Feature name="secure-playback" required="true" />
-        </MediaCodec>
-        <MediaCodec name="OMX.qcom.video.decoder.mpeg2" type="video/mpeg2" >
-            <Quirk name="requires-allocate-on-input-ports" />
-            <Quirk name="requires-allocate-on-output-ports" />
-            <Limit name="size" min="64x64" max="1920x1088" />
-            <Limit name="alignment" value="2x2" />
-            <Limit name="block-size" value="16x16" />
-            <Limit name="blocks-per-second" min="1" max="244800" />
-            <Limit name="bitrate" range="1-20000000" />
-            <Feature name="adaptive-playback" />
-        </MediaCodec>
-        <MediaCodec name="OMX.qcom.video.decoder.mpeg2.secure" type="video/mpeg2" >
-            <Quirk name="requires-allocate-on-input-ports" />
-            <Quirk name="requires-allocate-on-output-ports" />
+            <Quirk name="requires-timestamp-reorder" />
+            <Quirk name="video-controller-check-enable" />      
             <Limit name="size" min="64x64" max="1920x1088" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
@@ -232,6 +238,8 @@
         <MediaCodec name="OMX.qcom.video.decoder.mpeg4" type="video/mp4v-es" >
             <Quirk name="requires-allocate-on-input-ports" />
             <Quirk name="requires-allocate-on-output-ports" />
+            <Quirk name="requires-timestamp-reorder" />
+            <Quirk name="video-controller-check-enable" />            
             <Limit name="size" min="64x64" max="1920x1088" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
@@ -242,6 +250,8 @@
         <MediaCodec name="OMX.qcom.video.decoder.h263" type="video/3gpp" >
             <Quirk name="requires-allocate-on-input-ports" />
             <Quirk name="requires-allocate-on-output-ports" />
+            <Quirk name="requires-timestamp-reorder" />
+            <Quirk name="video-controller-check-enable" />            
             <Limit name="size" min="64x64" max="864x480" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
@@ -249,60 +259,11 @@
             <Limit name="bitrate" range="1-2000000" />
             <Feature name="adaptive-playback" />
         </MediaCodec>
-        <MediaCodec name="OMX.qcom.video.decoder.vc1" type="video/x-ms-wmv" >
-            <Quirk name="requires-allocate-on-input-ports" />
-            <Quirk name="requires-allocate-on-output-ports" />
-            <Limit name="size" min="64x64" max="1920x1088" />
-            <Limit name="alignment" value="2x2" />
-            <Limit name="block-size" value="16x16" />
-            <Limit name="blocks-per-second" min="1" max="244800" />
-            <Limit name="bitrate" range="1-20000000" />
-            <Feature name="adaptive-playback" />
-        </MediaCodec>
-        <MediaCodec name="OMX.qcom.video.decoder.vc1.secure" type="video/x-ms-wmv" >
-            <Quirk name="requires-allocate-on-input-ports" />
-            <Quirk name="requires-allocate-on-output-ports" />
-            <Limit name="size" min="64x64" max="1920x1088" />
-            <Limit name="alignment" value="2x2" />
-            <Limit name="block-size" value="16x16" />
-            <Limit name="blocks-per-second" min="1" max="244800" />
-            <Limit name="bitrate" range="1-20000000" />
-            <Feature name="adaptive-playback" />
-            <Feature name="secure-playback" required="true" />
-        </MediaCodec>
-        <MediaCodec name="OMX.qcom.video.decoder.divx" type="video/divx" >
-            <Quirk name="requires-allocate-on-input-ports" />
-            <Quirk name="requires-allocate-on-output-ports" />
-            <Limit name="size" min="64x64" max="1920x1088" />
-            <Limit name="alignment" value="2x2" />
-            <Limit name="block-size" value="16x16" />
-            <Limit name="blocks-per-second" min="1" max="244800" />
-            <Limit name="bitrate" range="1-10000000" />
-            <Feature name="adaptive-playback" />
-        </MediaCodec>
-        <MediaCodec name="OMX.qcom.video.decoder.divx311" type="video/divx311" >
-            <Quirk name="requires-allocate-on-input-ports" />
-            <Quirk name="requires-allocate-on-output-ports" />
-            <Limit name="size" min="64x64" max="720x480" />
-            <Limit name="alignment" value="2x2" />
-            <Limit name="block-size" value="16x16" />
-            <Limit name="blocks-per-second" min="1" max="40500" />
-            <Limit name="bitrate" range="1-2000000" />
-            <Feature name="adaptive-playback" />
-        </MediaCodec>
-        <MediaCodec name="OMX.qcom.video.decoder.divx4" type="video/divx4" >
-            <Quirk name="requires-allocate-on-input-ports" />
-            <Quirk name="requires-allocate-on-output-ports" />
-            <Limit name="size" min="64x64" max="1920x1088" />
-            <Limit name="alignment" value="2x2" />
-            <Limit name="block-size" value="16x16" />
-            <Limit name="blocks-per-second" min="1" max="244800" />
-            <Limit name="bitrate" range="1-10000000" />
-            <Feature name="adaptive-playback" />
-        </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.vp8" type="video/x-vnd.on2.vp8" >
             <Quirk name="requires-allocate-on-input-ports" />
             <Quirk name="requires-allocate-on-output-ports" />
+            <Quirk name="requires-timestamp-reorder" />
+            <Quirk name="video-controller-check-enable" />            
             <Limit name="size" min="64x64" max="1920x1088" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
@@ -313,6 +274,8 @@
         <MediaCodec name="OMX.qcom.video.decoder.hevc" type="video/hevc" >
             <Quirk name="requires-allocate-on-input-ports" />
             <Quirk name="requires-allocate-on-output-ports" />
+            <Quirk name="requires-timestamp-reorder" />
+            <Quirk name="video-controller-check-enable" />
             <Limit name="size" min="64x64" max="1920x1088" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
@@ -320,32 +283,18 @@
             <Limit name="bitrate" range="1-20000000" />
             <Feature name="adaptive-playback" />
         </MediaCodec>
-        <!-- Video Software  -->
+        <!-- Video Software -->
         <MediaCodec name="OMX.SEC.h263.sw.dec" type="video/3gpp" >
             <Quirk name="decoder-ignores-streamcorrupt-error" />
-        </MediaCodec>
+            </MediaCodec>
         <MediaCodec name="OMX.SEC.avc.sw.dec" type="video/avc" >
             <Quirk name="decoder-ignores-streamcorrupt-error" />
             <Limit name="size" min="64x64" max="2048x2048" />
-            <Feature name="adaptive-playback" />
+        <Feature name="adaptive-playback" />
         </MediaCodec>
         <MediaCodec name="OMX.SEC.mpeg4.sw.dec" type="video/mp4v-es" >
             <Quirk name="decoder-ignores-streamcorrupt-error" />
-        </MediaCodec>
-        <MediaCodec name="OMX.SEC.vc1.sw.dec" >
-            <Type name="video/x-ms-wmv"/>
-            <Type name="video/wvc1"/>
-            <Quirk name="decoder-ignores-streamcorrupt-error" />
-        </MediaCodec>
-        <MediaCodec name="OMX.SEC.wmv7.dec" type="video/x-ms-wmv7" >
-            <Quirk name="decoder-ignores-streamcorrupt-error" />
-        </MediaCodec>
-        <MediaCodec name="OMX.SEC.wmv8.dec" type="video/x-ms-wmv8" >
-            <Quirk name="decoder-ignores-streamcorrupt-error" />
-        </MediaCodec>
-        <MediaCodec name="OMX.SEC.mp43.dec" type="video/mp43" >
-        <Quirk name="decoder-ignores-streamcorrupt-error" />
-        </MediaCodec>
+            </MediaCodec>
         <MediaCodec name="OMX.SEC.hevc.sw.dec" type="video/hevc" >
             <Quirk name="decoder-ignores-streamcorrupt-error" />
             <Limit name="size" min="64x64" max="2048x2048" />
@@ -355,7 +304,9 @@
             <Quirk name="decoder-ignores-streamcorrupt-error" />
             <Limit name="size" min="64x64" max="2048x2048" />
             <Feature name="adaptive-playback" />
-        </MediaCodec>        
+        </MediaCodec>
     </Decoders>
+    <Include href="media_codecs_google_audio.xml" />
+    <Include href="media_codecs_google_telephony.xml" />
     <Include href="media_codecs_google_video.xml" />
 </MediaCodecs>
diff --git a/media/media_codecs_8939.xml b/media/media_codecs_8939.xml
index a012471..4162c78 100644
--- a/media/media_codecs_8939.xml
+++ b/media/media_codecs_8939.xml
@@ -109,43 +109,8 @@
   | vp8      | 1920    1088    30      20      244800  |
   |____________________________________________________|
 -->
-
 <MediaCodecs>
     <Encoders>
-        <!-- Video Hardware  -->
-        <MediaCodec name="OMX.qcom.video.encoder.mpeg4" type="video/mp4v-es" >
-            <Quirk name="requires-allocate-on-input-ports" />
-            <Quirk name="requires-allocate-on-output-ports"/>
-            <Quirk name="requires-loaded-to-idle-after-allocation"/>
-            <Limit name="size" min="96x64" max="1920x1088" />
-            <Limit name="alignment" value="2x2" />
-            <Limit name="block-size" value="16x16" />
-            <Limit name="blocks-per-second" min="1" max="244800" />
-            <Limit name="bitrate" range="1-20000000" />
-            <Quirk name="video-controller-check-enable" />
-        </MediaCodec>
-        <MediaCodec name="OMX.qcom.video.encoder.h263" type="video/3gpp" >
-            <Quirk name="requires-allocate-on-input-ports" />
-            <Quirk name="requires-allocate-on-output-ports"/>
-            <Quirk name="requires-loaded-to-idle-after-allocation"/>
-            <Limit name="size" min="96x64" max="720x576" />
-            <Limit name="alignment" value="2x2" />
-            <Limit name="block-size" value="16x16" />
-            <Limit name="blocks-per-second" min="1" max="48600" />
-            <Limit name="bitrate" range="1-2000000" />
-            <Quirk name="video-controller-check-enable" />
-        </MediaCodec>
-        <MediaCodec name="OMX.qcom.video.encoder.avc" type="video/avc" >
-            <Quirk name="requires-allocate-on-input-ports" />
-            <Quirk name="requires-allocate-on-output-ports"/>
-            <Quirk name="requires-loaded-to-idle-after-allocation"/>
-            <Limit name="size" min="96x64" max="1920x1088" />
-            <Limit name="alignment" value="2x2" />
-            <Limit name="block-size" value="16x16" />
-            <Limit name="blocks-per-second" min="1" max="244800" />
-            <Limit name="bitrate" range="1-20000000" />
-            <Quirk name="video-controller-check-enable" />
-        </MediaCodec>
         <!-- Audio Hardware  -->
         <MediaCodec name="OMX.qcom.audio.encoder.evrc" type="audio/evrc" >
             <Quirk name="requires-allocate-on-input-ports" />
@@ -155,6 +120,52 @@
             <Quirk name="requires-allocate-on-input-ports" />
             <Quirk name="requires-allocate-on-output-ports" />
         </MediaCodec>
+        <!-- Audio Software  -->
+        <!-- Video Hardware  -->
+        <MediaCodec name="OMX.qcom.video.encoder.avc" type="video/avc" >
+            <Quirk name="requires-allocate-on-input-ports" />
+            <Quirk name="requires-allocate-on-output-ports" />
+            <Quirk name="video-controller-check-enable" />
+            <Quirk name="requires-loaded-to-idle-after-allocation" />
+            <Limit name="size" min="96x64" max="1920x1088" />
+            <Limit name="alignment" value="2x2" />
+            <Limit name="block-size" value="16x16" />
+            <Limit name="blocks-per-second" min="1" max="244800" />
+            <Limit name="bitrate" range="1-20000000" />
+        </MediaCodec>
+        <MediaCodec name="OMX.qcom.video.encoder.mpeg4" type="video/mp4v-es" >
+            <Quirk name="requires-allocate-on-input-ports" />
+            <Quirk name="requires-allocate-on-output-ports" />
+            <Quirk name="video-controller-check-enable" />
+            <Quirk name="requires-loaded-to-idle-after-allocation"/>
+            <Limit name="size" min="96x64" max="1920x1088" />
+            <Limit name="alignment" value="2x2" />
+            <Limit name="block-size" value="16x16" />
+            <Limit name="blocks-per-second" min="1" max="244800" />
+            <Limit name="bitrate" range="1-20000000" />
+        </MediaCodec>
+        <MediaCodec name="OMX.qcom.video.encoder.h263" type="video/3gpp" >
+            <Quirk name="requires-allocate-on-input-ports" />
+            <Quirk name="requires-allocate-on-output-ports" />
+            <Quirk name="video-controller-check-enable" />
+            <Quirk name="requires-loaded-to-idle-after-allocation" />
+            <Limit name="size" min="96x64" max="864x480" />
+            <Limit name="alignment" value="2x2" />
+            <Limit name="block-size" value="16x16" />
+            <Limit name="blocks-per-second" min="1" max="48600" />
+            <Limit name="bitrate" range="1-2000000" />
+        </MediaCodec>
+        <MediaCodec name="OMX.qcom.video.encoder.vp8" type="video/x-vnd.on2.vp8" >
+            <Quirk name="requires-allocate-on-input-ports" />
+            <Quirk name="requires-allocate-on-output-ports" />
+            <Quirk name="video-controller-check-enable" />
+            <Quirk name="requires-loaded-to-idle-after-allocation" />
+            <Limit name="size" min="96x64" max="1920x1088" />
+            <Limit name="alignment" value="2x2" />
+            <Limit name="block-size" value="16x16" />
+            <Limit name="blocks-per-second" min="1" max="244800" />
+            <Limit name="bitrate" range="1-20000000" />
+        </MediaCodec>
     </Encoders>
     <Decoders>
         <!-- Audio Software  -->
@@ -163,7 +174,7 @@
             <Type name="audio/3gpp"  />
             <Quirk name="needs-flush-before-disable" />
             <Quirk name="decoder-ignores-streamcorrupt-error" />
-        </MediaCodec>            
+        </MediaCodec>
         <MediaCodec name="OMX.SEC.mp3.dec">
             <Type name="audio/mpeg"/>
             <Type name="audio/mpeg-L1"/>
@@ -179,19 +190,20 @@
             <Quirk name="needs-flush-before-disable" />
             <Quirk name="decoder-ignores-streamcorrupt-error" />
         </MediaCodec>
-        <MediaCodec name="OMX.SEC.wma.dec" type="audio/x-ms-wma" >
-            <Quirk name="needs-flush-before-disable" />
-            <Quirk name="decoder-ignores-streamcorrupt-error" />
-        </MediaCodec>
         <MediaCodec name="OMX.SEC.adpcm.dec" type="audio/x-ima" >
-            <Quirk name="needs-flush-before-disable" />
+        <Quirk name="needs-flush-before-disable" />
             <Quirk name="decoder-ignores-streamcorrupt-error" />
         </MediaCodec>
         <!-- Audio Hardware  -->
         <MediaCodec name="OMX.qcom.audio.decoder.amrwbplus" type="audio/amr-wb-plus" >
         </MediaCodec>
         <!-- Audio Software  -->
-        <MediaCodec name="OMX.google.aac.decoder" type="audio/mp4a-latm" />
+        <!--
+            Use Google's RAW decoder to support ACodec path for FLAC clips as
+            FLACDecoder is non-OMX component based. A component can be used to
+            support several mimetypes, so existing raw decoder usecases will not
+            be affected by this.
+        -->
         <MediaCodec name="OMX.qcom.audio.decoder.Qcelp13" type="audio/qcelp" >
             <Quirk name="requires-global-flush" />
         </MediaCodec>
@@ -203,7 +215,7 @@
             <Quirk name="requires-allocate-on-input-ports" />
             <Quirk name="requires-allocate-on-output-ports" />
             <Quirk name="requires-timestamp-reorder" />
-            <Quirk name="video-controller-check-enable" /> 
+            <Quirk name="video-controller-check-enable" />            
             <Limit name="size" min="64x64" max="1920x1088" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
@@ -215,7 +227,7 @@
             <Quirk name="requires-allocate-on-input-ports" />
             <Quirk name="requires-allocate-on-output-ports" />
             <Quirk name="requires-timestamp-reorder" />
-            <Quirk name="video-controller-check-enable" />
+            <Quirk name="video-controller-check-enable" />      
             <Limit name="size" min="64x64" max="1920x1088" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
@@ -228,7 +240,7 @@
             <Quirk name="requires-allocate-on-input-ports" />
             <Quirk name="requires-allocate-on-output-ports" />
             <Quirk name="requires-timestamp-reorder" />
-            <Quirk name="video-controller-check-enable" />
+            <Quirk name="video-controller-check-enable" />            
             <Limit name="size" min="64x64" max="1920x1088" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
@@ -240,7 +252,7 @@
             <Quirk name="requires-allocate-on-input-ports" />
             <Quirk name="requires-allocate-on-output-ports" />
             <Quirk name="requires-timestamp-reorder" />
-            <Quirk name="video-controller-check-enable" />
+            <Quirk name="video-controller-check-enable" />            
             <Limit name="size" min="64x64" max="864x480" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
@@ -248,13 +260,15 @@
             <Limit name="bitrate" range="1-2000000" />
             <Feature name="adaptive-playback" />
         </MediaCodec>
+        <!-- don't support vc1 for MASS project -->
+        <!--
         <MediaCodec name="OMX.qcom.video.decoder.vc1">
             <Type name="video/x-ms-wmv"/>
             <Type name="video/wvc1"/>
             <Quirk name="requires-allocate-on-input-ports" />
             <Quirk name="requires-allocate-on-output-ports" />
             <Quirk name="requires-timestamp-reorder" />
-            <Quirk name="video-controller-check-enable" />
+            <Quirk name="video-controller-check-enable" />            
             <Limit name="size" min="64x64" max="1920x1088" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
@@ -264,11 +278,11 @@
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.vc1.secure">
             <Type name="video/x-ms-wmv"/>
-            <Type name="video/wvc1"/>
+            <Type name="video/wvc1"/>        	
             <Quirk name="requires-allocate-on-input-ports" />
             <Quirk name="requires-allocate-on-output-ports" />
             <Quirk name="requires-timestamp-reorder" />
-            <Quirk name="video-controller-check-enable" />
+            <Quirk name="video-controller-check-enable" />            
             <Limit name="size" min="64x64" max="1920x1088" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
@@ -277,43 +291,12 @@
             <Feature name="adaptive-playback" />
             <Feature name="secure-playback" required="true" />
         </MediaCodec>
-        <!--
-        <MediaCodec name="OMX.qcom.video.decoder.divx" type="video/divx" >
-            <Quirk name="requires-allocate-on-input-ports" />
-            <Quirk name="requires-allocate-on-output-ports" />
-            <Limit name="size" min="64x64" max="1920x1088" />
-            <Limit name="alignment" value="2x2" />
-            <Limit name="block-size" value="16x16" />
-            <Limit name="blocks-per-second" min="1" max="244800" />
-            <Limit name="bitrate" range="1-50000000" />
-            <Feature name="adaptive-playback" />
-        </MediaCodec>
-        <MediaCodec name="OMX.qcom.video.decoder.divx311" type="video/divx311" >
-            <Quirk name="requires-allocate-on-input-ports" />
-            <Quirk name="requires-allocate-on-output-ports" />
-            <Limit name="size" min="64x64" max="1920X1088" />
-            <Limit name="alignment" value="2x2" />
-            <Limit name="block-size" value="16x16" />
-            <Limit name="blocks-per-second" min="1" max="244800" />
-            <Limit name="bitrate" range="1-20000000" />
-            <Feature name="adaptive-playback" />
-        </MediaCodec>
-        <MediaCodec name="OMX.qcom.video.decoder.divx4" type="video/divx4" >
-            <Quirk name="requires-allocate-on-input-ports" />
-            <Quirk name="requires-allocate-on-output-ports" />
-            <Limit name="size" min="64x64" max="1920x1088" />
-            <Limit name="alignment" value="2x2" />
-            <Limit name="block-size" value="16x16" />
-            <Limit name="blocks-per-second" min="1" max="244800" />
-            <Limit name="bitrate" range="1-50000000" />
-            <Feature name="adaptive-playback" />
-        </MediaCodec>
         -->
         <MediaCodec name="OMX.qcom.video.decoder.vp8" type="video/x-vnd.on2.vp8" >
             <Quirk name="requires-allocate-on-input-ports" />
             <Quirk name="requires-allocate-on-output-ports" />
             <Quirk name="requires-timestamp-reorder" />
-            <Quirk name="video-controller-check-enable" />
+            <Quirk name="video-controller-check-enable" />            
             <Limit name="size" min="64x64" max="1920x1088" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
@@ -324,17 +307,19 @@
         <MediaCodec name="OMX.qcom.video.decoder.hevc" type="video/hevc" >
             <Quirk name="requires-allocate-on-input-ports" />
             <Quirk name="requires-allocate-on-output-ports" />
-            <Limit name="size" min="64x64" max="1920X1080" />
+            <Quirk name="requires-timestamp-reorder" />
+            <Quirk name="video-controller-check-enable" />            
+            <Limit name="size" min="64x64" max="1920X1088" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
             <Limit name="blocks-per-second" min="1" max="489600" />
             <Limit name="bitrate" range="1-50000000" />
             <Feature name="adaptive-playback" />
         </MediaCodec>
-        <!-- Video Software  -->
+        <!-- Video Software -->
         <MediaCodec name="OMX.SEC.h263.sw.dec" type="video/3gpp" >
             <Quirk name="decoder-ignores-streamcorrupt-error" />
-        </MediaCodec>
+            </MediaCodec>
         <MediaCodec name="OMX.SEC.avc.sw.dec" type="video/avc" >
             <Quirk name="decoder-ignores-streamcorrupt-error" />
             <Limit name="size" min="64x64" max="2048x2048" />
@@ -342,21 +327,7 @@
         </MediaCodec>
         <MediaCodec name="OMX.SEC.mpeg4.sw.dec" type="video/mp4v-es" >
             <Quirk name="decoder-ignores-streamcorrupt-error" />
-        </MediaCodec>
-        <MediaCodec name="OMX.SEC.vc1.sw.dec" >
-            <Type name="video/x-ms-wmv"/>
-            <Type name="video/wvc1"/>
-            <Quirk name="decoder-ignores-streamcorrupt-error" />
-        </MediaCodec>
-        <MediaCodec name="OMX.SEC.wmv7.dec" type="video/x-ms-wmv7" >
-            <Quirk name="decoder-ignores-streamcorrupt-error" />
-        </MediaCodec>
-        <MediaCodec name="OMX.SEC.wmv8.dec" type="video/x-ms-wmv8" >
-            <Quirk name="decoder-ignores-streamcorrupt-error" />
-        </MediaCodec>
-        <MediaCodec name="OMX.SEC.mp43.dec" type="video/mp43" >
-        <Quirk name="decoder-ignores-streamcorrupt-error" />
-        </MediaCodec>
+            </MediaCodec>
         <MediaCodec name="OMX.SEC.hevc.sw.dec" type="video/hevc" >
             <Quirk name="decoder-ignores-streamcorrupt-error" />
             <Limit name="size" min="64x64" max="2048x2048" />
@@ -367,15 +338,14 @@
             <Limit name="size" min="64x64" max="2048x2048" />
             <Feature name="adaptive-playback" />
         </MediaCodec>
+        <!--
+            Use Google's mpeg4 decoder for mpeg4 DP content which is not
+            supported by HW. A component can be used to support several
+            mimetypes, so non-DP mpeg4 usecases will not be affected by this.
+        -->
+        <MediaCodec name="OMX.google.mpeg4.decoder" type="video/mp4v-esdp" />        
     </Decoders>
-    <Include href="media_codecs_google_video.xml" />
     <Include href="media_codecs_google_audio.xml" />
     <Include href="media_codecs_google_telephony.xml" />
-    <Encoders>
-        <MediaCodec name="OMX.SEC.naac.enc" type="audio/mp4a-latm">
-            <Limit name="channel-count" max="6" />
-            <Limit name="sample-rate" ranges="11025,12000,16000,22050,24000,32000,44100,48000" />
-            <Limit name="bitrate" range="8000-960000" />
-        </MediaCodec>
-    </Encoders>    
+    <Include href="media_codecs_google_video.xml" />
 </MediaCodecs>
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 8eefc21..01aee2d 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -23,5 +23,5 @@
          Empty is viewed as "all".  Only used on devices which
          don't support RIL_REQUEST_GET_RADIO_CAPABILITY
          format is UMTS|LTE|... -->
-    <string translatable="false" name="config_radio_access_family">GSM|GPRS|EDGE|CDMA|EVDO|UMTS|HSPA|HSPAP|LTE</string>
+    <string translatable="false" name="config_radio_access_family">GSM|GPRS|EDGE|UMTS|HSPA|HSPAP</string>
 </resources>
diff --git a/system_prop.mk b/system_prop.mk
index b154cf8..e1106ed 100644
--- a/system_prop.mk
+++ b/system_prop.mk
@@ -1,6 +1,6 @@
 # CABL
 PRODUCT_PROPERTY_OVERRIDES += \
-	ro.qualcomm.cabl=0
+	ro.qualcomm.cabl=2
 
 # RAM
 PRODUCT_PROPERTY_OVERRIDES += \
@@ -13,4 +13,4 @@
 
 # Screen
 PRODUCT_PROPERTY_OVERRIDES += \
-	ro.sf.lcd_density=240
+	ro.sf.lcd_density=320
diff --git a/vendorsetup.sh b/vendorsetup.sh
index 397172b..62b3b6d 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -1,3 +1,3 @@
 for i in eng userdebug user; do
-	add_lunch_combo lineage_gprimelte-${i}
+	add_lunch_combo lineage_j53gxx-${i}
 done