diff --git a/audio/oriole/config/mixer_paths_factory.xml b/audio/oriole/config/mixer_paths_factory.xml
index 57633f5..3326db7 100644
--- a/audio/oriole/config/mixer_paths_factory.xml
+++ b/audio/oriole/config/mixer_paths_factory.xml
@@ -36,6 +36,14 @@
         <ctl name="EP1 TX Mixer TDM_0_TX" value="1" />
     </path>
 
+    <path name="mfg-record usb-headset-mic">
+        <ctl name="Audio Capture Mic Source" value="USB_MIC"/>
+        <ctl name="USB Capture FORMAT v2" value="1" />
+        <ctl name="USB Config To AoC v2" value="1"/>
+        <ctl name="EP1 TX Mixer USB_TX" value="1"/>
+        <ctl name="MIC Record Soft Gain (dB)" value="0" />
+    </path>
+
     <path name="mic1-status">
         <ctl name="MIC0" value="1" />
     </path>
@@ -233,12 +241,13 @@
     </path>
 
     <path name="mfg-playback usb-headphones">
-        <ctl name="USB Dev ID" value="1" />
-        <ctl name="USB Playback EP ID" value="1" />
-        <ctl name="USB Playback SR" value="48000" />
-        <ctl name="USB Playback CH" value="2" />
-        <ctl name="USB Playback BW" value="16" />
-        <ctl name="USB Config To AoC" value="1" />
+        <ctl name="USB Dev ID v2" value="2" />
+        <ctl name="USB Playback EP ID v2" value="1" />
+        <ctl name="USB Playback FORMAT v2" value="6" />
+        <ctl name="USB Playback SR v2" value="48000" />
+        <ctl name="USB Playback CH v2" value="2" />
+        <ctl name="USB Playback BW v2" value="16" />
+        <ctl name="USB Config To AoC v2" value="1" />
         <ctl name="USB_RX Mixer EP3" value="1" />
     </path>
 
@@ -300,9 +309,15 @@
     </path>
 
     <path name="loopback-usb-mic-speaker">
+        <ctl name="Audio Capture Mic Source" value="USB_MIC" />
+        <ctl name="USB Capture FORMAT v2" value="1" />
+        <ctl name="MIC Record Soft Gain (dB)" value="0" />
     </path>
 
     <path name="loopback-usb-mic-usb-headphone">
+        <ctl name="Audio Capture Mic Source" value="USB_MIC" />
+        <ctl name="USB Capture FORMAT v2" value="1" />
+        <ctl name="MIC Record Soft Gain (dB)" value="0" />
     </path>
 
     <pcm_id name="loopback-mic1" value="EP1 capture (*)"/>
diff --git a/audio/raven/config/mixer_paths_factory.xml b/audio/raven/config/mixer_paths_factory.xml
index 57633f5..3326db7 100644
--- a/audio/raven/config/mixer_paths_factory.xml
+++ b/audio/raven/config/mixer_paths_factory.xml
@@ -36,6 +36,14 @@
         <ctl name="EP1 TX Mixer TDM_0_TX" value="1" />
     </path>
 
+    <path name="mfg-record usb-headset-mic">
+        <ctl name="Audio Capture Mic Source" value="USB_MIC"/>
+        <ctl name="USB Capture FORMAT v2" value="1" />
+        <ctl name="USB Config To AoC v2" value="1"/>
+        <ctl name="EP1 TX Mixer USB_TX" value="1"/>
+        <ctl name="MIC Record Soft Gain (dB)" value="0" />
+    </path>
+
     <path name="mic1-status">
         <ctl name="MIC0" value="1" />
     </path>
@@ -233,12 +241,13 @@
     </path>
 
     <path name="mfg-playback usb-headphones">
-        <ctl name="USB Dev ID" value="1" />
-        <ctl name="USB Playback EP ID" value="1" />
-        <ctl name="USB Playback SR" value="48000" />
-        <ctl name="USB Playback CH" value="2" />
-        <ctl name="USB Playback BW" value="16" />
-        <ctl name="USB Config To AoC" value="1" />
+        <ctl name="USB Dev ID v2" value="2" />
+        <ctl name="USB Playback EP ID v2" value="1" />
+        <ctl name="USB Playback FORMAT v2" value="6" />
+        <ctl name="USB Playback SR v2" value="48000" />
+        <ctl name="USB Playback CH v2" value="2" />
+        <ctl name="USB Playback BW v2" value="16" />
+        <ctl name="USB Config To AoC v2" value="1" />
         <ctl name="USB_RX Mixer EP3" value="1" />
     </path>
 
@@ -300,9 +309,15 @@
     </path>
 
     <path name="loopback-usb-mic-speaker">
+        <ctl name="Audio Capture Mic Source" value="USB_MIC" />
+        <ctl name="USB Capture FORMAT v2" value="1" />
+        <ctl name="MIC Record Soft Gain (dB)" value="0" />
     </path>
 
     <path name="loopback-usb-mic-usb-headphone">
+        <ctl name="Audio Capture Mic Source" value="USB_MIC" />
+        <ctl name="USB Capture FORMAT v2" value="1" />
+        <ctl name="MIC Record Soft Gain (dB)" value="0" />
     </path>
 
     <pcm_id name="loopback-mic1" value="EP1 capture (*)"/>
diff --git a/conf/init.raviole.rc b/conf/init.raviole.rc
index cb70c03..22f0917 100644
--- a/conf/init.raviole.rc
+++ b/conf/init.raviole.rc
@@ -56,3 +56,9 @@ on property:ro.revision=PROTO1.0
 # SecureElement eSE2 cts mode
 on property:persist.vendor.se.ese2.mode=ctsmode
     write /sys/class/st33spi/st33spi/st33spi_state 33
+
+# charger driver exposes now finer grain control, map demo mode to those properties
+# NOTE: demo mode can only be exit wiping data (which reset the persist properties)
+on property:sys.retaildemo.enabled=1
+    setprop persist.vendor.charge.stop.level 35
+    setprop persist.vendor.charge.start.level 30
diff --git a/conf/init.slider.rc b/conf/init.slider.rc
index f8506a5..3042b5b 100644
--- a/conf/init.slider.rc
+++ b/conf/init.slider.rc
@@ -26,3 +26,9 @@ service insmod_sh_slider /vendor/bin/init.insmod.sh /vendor/etc/init.insmod.slid
     group root system
     disabled
     oneshot
+
+# charger driver exposes now finer grain control, map demo mode to those properties
+# NOTE: demo mode can only be exit wiping data (which reset the persist properties)
+on property:sys.retaildemo.enabled=1
+    setprop persist.vendor.charge.stop.level 35
+    setprop persist.vendor.charge.start.level 30
diff --git a/conf/init.whitefin.rc b/conf/init.whitefin.rc
index f74abbb..c030ad7 100644
--- a/conf/init.whitefin.rc
+++ b/conf/init.whitefin.rc
@@ -24,3 +24,9 @@ service insmod_sh_whitefin /vendor/bin/init.insmod.sh /vendor/etc/init.insmod.wh
 on fs
     # Fingerprint
     chown system system /dev/goodix_fp
+
+# charger driver exposes now finer grain control, map demo mode to those properties
+# NOTE: demo mode can only be exit wiping data (which reset the persist properties)
+on property:sys.retaildemo.enabled=1
+    setprop persist.vendor.charge.stop.level 35
+    setprop persist.vendor.charge.start.level 30