diff --git a/audio/comet/aidl_config/mixer_paths_aidl.xml b/audio/comet/aidl_config/mixer_paths_aidl.xml
index 6fb772f..a5d8e60 100644
--- a/audio/comet/aidl_config/mixer_paths_aidl.xml
+++ b/audio/comet/aidl_config/mixer_paths_aidl.xml
@@ -71,8 +71,6 @@
   <ctl name="R ASPTX4 Slot Position" value="7" />
 
   <!-- Cirrus Booster Amp DRE and VBST config-->
-  <ctl name="VBSTMON Output Switch" value="1" />
-  <ctl name="R VBSTMON Output Switch" value="1" />
   <ctl name="DRE DRE Switch" value="1" />
   <ctl name="R DRE DRE Switch" value="1" />
 
@@ -144,7 +142,6 @@
   <ctl name="TDM_1_RX Mixer EP5" value="0" />
   <ctl name="TDM_1_RX Mixer EP6" value="0" />
   <ctl name="TDM_1_RX Mixer EP7" value="0" />
-  <ctl name="TDM_1_RX Mixer EP8" value="0" />
   <ctl name="TDM_1_RX Mixer NoHost1" value="0" />
 
   <ctl name="USB_RX Mixer EP1" value="0" />
@@ -1226,53 +1223,9 @@
     <ctl name="NoHost1 TX Mixer TDM_0_TX" value="1" />
   </path>
 
-  <path name="telephony-rx (VOICE_DOWNLINK) -> in-call-capture-0">
-    <ctl name="Incall Capture Stream0" value="DL" />
-  </path>
-
-  <path name="telephony-rx (VOICE_UPLINK) -> in-call-capture-0">
-    <ctl name="Incall Capture Stream0" value="UL" />
-  </path>
-
-  <path name="telephony-rx (VOICE_CALL) -> in-call-capture-0">
-    <ctl name="Incall Capture Stream0" value="UL_DL" />
-  </path>
-
-  <path name="telephony-rx -> in-call-capture-0">
-    <ctl name="Incall Capture Stream0" value="DL" />
-  </path>
-
-  <path name="telephony-rx (VOICE_DOWNLINK) -> in-call-capture-1">
-    <ctl name="Incall Capture Stream1" value="DL" />
-  </path>
-
-  <path name="telephony-rx (VOICE_UPLINK) -> in-call-capture-1">
-    <ctl name="Incall Capture Stream1" value="UL" />
-  </path>
-
-  <path name="telephony-rx (VOICE_CALL) -> in-call-capture-1">
-    <ctl name="Incall Capture Stream1" value="UL_DL" />
-  </path>
-
-  <path name="telephony-rx -> in-call-capture-1">
-    <ctl name="Incall Capture Stream1" value="DL" />
-  </path>
-
-  <path name="telephony-rx (VOICE_DOWNLINK) -> in-call-capture-2">
-    <ctl name="Incall Capture Stream2" value="DL" />
-  </path>
-
-  <path name="telephony-rx (VOICE_UPLINK) -> in-call-capture-2">
-    <ctl name="Incall Capture Stream2" value="UL" />
-  </path>
-
-  <path name="telephony-rx (VOICE_CALL) -> in-call-capture-2">
-    <ctl name="Incall Capture Stream2" value="UL_DL" />
-  </path>
-
-  <path name="telephony-rx -> in-call-capture-2">
-    <ctl name="Incall Capture Stream2" value="DL" />
-  </path>
+  <path name="in-call-capture-source-0 -> in-call-capture-0" />
+  <path name="in-call-capture-source-1 -> in-call-capture-1" />
+  <path name="in-call-capture-source-2 -> in-call-capture-2" />
 
   <!-- codec setting -->
   <!-- Rx device -->
@@ -1420,6 +1373,54 @@
     <path name="usb-microphones" />
   </path>
 
+  <path name="in-call-capture-source-0 (VOICE_DOWNLINK)">
+    <ctl name="Incall Capture Stream0" value="DL" />
+  </path>
+
+  <path name="in-call-capture-source-0 (VOICE_UPLINK)">
+    <ctl name="Incall Capture Stream0" value="UL" />
+  </path>
+
+  <path name="in-call-capture-source-0 (VOICE_CALL)">
+    <ctl name="Incall Capture Stream0" value="UL_DL" />
+  </path>
+
+  <path name="in-call-capture-source-0">
+    <path name="in-call-capture-source-0 (VOICE_DOWNLINK)" />
+  </path>
+
+  <path name="in-call-capture-source-1 (VOICE_DOWNLINK)">
+    <ctl name="Incall Capture Stream1" value="DL" />
+  </path>
+
+  <path name="in-call-capture-source-1 (VOICE_UPLINK)">
+    <ctl name="Incall Capture Stream1" value="UL" />
+  </path>
+
+  <path name="in-call-capture-source-1 (VOICE_CALL)">
+    <ctl name="Incall Capture Stream1" value="UL_DL" />
+  </path>
+
+  <path name="in-call-capture-source-1">
+    <path name="in-call-capture-source-1 (VOICE_DOWNLINK)" />
+  </path>
+
+  <path name="in-call-capture-source-2 (VOICE_DOWNLINK)">
+    <ctl name="Incall Capture Stream2" value="DL" />
+  </path>
+
+  <path name="in-call-capture-source-2 (VOICE_UPLINK)">
+    <ctl name="Incall Capture Stream2" value="UL" />
+  </path>
+
+  <path name="in-call-capture-source-2 (VOICE_CALL)">
+    <ctl name="Incall Capture Stream2" value="UL_DL" />
+  </path>
+
+  <path name="in-call-capture-source-2">
+    <path name="in-call-capture-source-2 (VOICE_DOWNLINK)" />
+  </path>
+
   <!-- cs35l41 specific path to load firmware in cs35l41.c -->
   <path name="cs35l41-load-protection-firmware-start">
     <!-- Enable it after get the protection firmware -->
diff --git a/location/user/gps.cfg b/location/user/gps.cfg
index 9f96c20..a66f326 100644
--- a/location/user/gps.cfg
+++ b/location/user/gps.cfg
@@ -40,6 +40,7 @@ Sif_UseFwXtraInterface=1
 Agnss_IsGloAidingEnable=0
 SETCaps_IsOtdoa=1
 SETCaps_IsLpp=1
+SETCaps_SuplUT1=20
 PosReq_Supl2Params_SuplNiUdpPort=7275
 GlueLayer_LPPCpBitmask=0x17
 GlueLayer_IsCpLteNeighborCellEnable=1
diff --git a/location/userdebug/gps.cfg b/location/userdebug/gps.cfg
index 40985ca..accf419 100644
--- a/location/userdebug/gps.cfg
+++ b/location/userdebug/gps.cfg
@@ -164,6 +164,7 @@ Sif_UseFwXtraInterface=1
 Agnss_IsGloAidingEnable=0
 SETCaps_IsOtdoa=1
 SETCaps_IsLpp=1
+SETCaps_SuplUT1=20
 PosReq_Supl2Params_SuplNiUdpPort=7275
 GlueLayer_LPPCpBitmask=0x17
 GlueLayer_IsCpLteNeighborCellEnable=1
diff --git a/rro_overlays/NfcOverlay/res/values/config.xml b/rro_overlays/NfcOverlay/res/values/config.xml
index a45426d..1c32c7a 100644
--- a/rro_overlays/NfcOverlay/res/values/config.xml
+++ b/rro_overlays/NfcOverlay/res/values/config.xml
@@ -22,4 +22,16 @@
   </string-array>
   <bool name="tag_intent_app_pref_supported">true</bool>
   <bool name="nfc_observe_mode_supported">true</bool>
+  <!-- NFC Antenna Location API -->
+  <integer name="device_width">150</integer>
+  <integer name="device_height">155</integer>
+  <bool name="device_foldable">true</bool>
+  <integer-array name="antenna_x">
+    <item>114</item>
+    <item>39</item>
+  </integer-array>
+  <integer-array name="antenna_y">
+    <item>83</item>
+    <item>83</item>
+  </integer-array>
 </resources>