diff --git a/audio/oriole/config/audio_policy_configuration.xml b/audio/oriole/config/audio_policy_configuration.xml
index 3dac849..188d533 100644
--- a/audio/oriole/config/audio_policy_configuration.xml
+++ b/audio/oriole/config/audio_policy_configuration.xml
@@ -20,6 +20,7 @@
                 <item>Speaker Safe</item>
                 <item>Earpiece</item>
                 <item>Built-In Mic</item>
+                <item>Built-In Back Mic</item>
                 <item>Telephony Tx</item>
                 <item>Voice Call And Telephony Rx</item>
                 <item>Echo Ref In</item>
@@ -207,17 +208,17 @@
                        sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
                 <route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" />
                 <route type="mix" sink="primary input"
-                       sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
                 <route type="mix" sink="hotword input"
-                       sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
                 <route type="mix" sink="incall capture" sources="Voice Call And Telephony Rx" />
                 <route type="mix" sink="voice call rx" sources="Voice Call And Telephony Rx" />
                 <route type="mix" sink="voip_tx"
-                       sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
                 <route type="mix" sink="fast input"
-                       sources="Built-In Mic,USB Device In,USB Headset In"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
                 <route type="mix" sink="mmap_no_irq_in"
-                       sources="Built-In Mic,USB Device In,USB Headset In"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
                 <route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" />
                 <route type="mix" sink="echo_ref_input" sources="Echo Ref In"/>
             </routes>
diff --git a/audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml
index b22a903..c3e64c0 100644
--- a/audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml
+++ b/audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml
@@ -20,6 +20,7 @@
                 <item>Speaker Safe</item>
                 <item>Earpiece</item>
                 <item>Built-In Mic</item>
+                <item>Built-In Back Mic</item>
                 <item>Telephony Tx</item>
                 <item>Voice Call And Telephony Rx</item>
                 <item>Echo Ref In</item>
@@ -186,17 +187,17 @@
                        sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
                 <route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" />
                 <route type="mix" sink="primary input"
-                       sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
                 <route type="mix" sink="hotword input"
-                       sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
                 <route type="mix" sink="incall capture" sources="Voice Call And Telephony Rx" />
                 <route type="mix" sink="voice call rx" sources="Voice Call And Telephony Rx" />
                 <route type="mix" sink="voip_tx"
-                       sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
                 <route type="mix" sink="fast input"
-                       sources="Built-In Mic,USB Device In,USB Headset In"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
                 <route type="mix" sink="mmap_no_irq_in"
-                       sources="Built-In Mic,USB Device In,USB Headset In"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
                 <route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" />
                 <route type="mix" sink="echo_ref_input" sources="Echo Ref In"/>
             </routes>
diff --git a/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml
index a5dafff..d0b1986 100644
--- a/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml
+++ b/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml
@@ -20,6 +20,7 @@
                 <item>Speaker Safe</item>
                 <item>Earpiece</item>
                 <item>Built-In Mic</item>
+                <item>Built-In Back Mic</item>
                 <item>Telephony Tx</item>
                 <item>Voice Call And Telephony Rx</item>
                 <item>Echo Ref In</item>
@@ -186,17 +187,17 @@
                        sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
                 <route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" />
                 <route type="mix" sink="primary input"
-                       sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
                 <route type="mix" sink="hotword input"
-                       sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
                 <route type="mix" sink="incall capture" sources="Voice Call And Telephony Rx" />
                 <route type="mix" sink="voice call rx" sources="Voice Call And Telephony Rx" />
                 <route type="mix" sink="voip_tx"
-                       sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
                 <route type="mix" sink="fast input"
-                       sources="Built-In Mic,USB Device In,USB Headset In"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
                 <route type="mix" sink="mmap_no_irq_in"
-                       sources="Built-In Mic,USB Device In,USB Headset In"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
                 <route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" />
                 <route type="mix" sink="echo_ref_input" sources="Echo Ref In"/>
             </routes>
diff --git a/audio/oriole/cs35l41/fw/R-cs35l41-dsp1-spk-prot.bin b/audio/oriole/cs35l41/fw/R-cs35l41-dsp1-spk-prot.bin
index d97b3a5..463dc81 100644
Binary files a/audio/oriole/cs35l41/fw/R-cs35l41-dsp1-spk-prot.bin and b/audio/oriole/cs35l41/fw/R-cs35l41-dsp1-spk-prot.bin differ
diff --git a/audio/oriole/cs35l41/fw/cs35l41-dsp1-spk-prot.bin b/audio/oriole/cs35l41/fw/cs35l41-dsp1-spk-prot.bin
index 3b8afd6..b349ba3 100644
Binary files a/audio/oriole/cs35l41/fw/cs35l41-dsp1-spk-prot.bin and b/audio/oriole/cs35l41/fw/cs35l41-dsp1-spk-prot.bin differ
diff --git a/audio/raven/config/audio_policy_configuration.xml b/audio/raven/config/audio_policy_configuration.xml
index 3dac849..188d533 100644
--- a/audio/raven/config/audio_policy_configuration.xml
+++ b/audio/raven/config/audio_policy_configuration.xml
@@ -20,6 +20,7 @@
                 <item>Speaker Safe</item>
                 <item>Earpiece</item>
                 <item>Built-In Mic</item>
+                <item>Built-In Back Mic</item>
                 <item>Telephony Tx</item>
                 <item>Voice Call And Telephony Rx</item>
                 <item>Echo Ref In</item>
@@ -207,17 +208,17 @@
                        sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
                 <route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" />
                 <route type="mix" sink="primary input"
-                       sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
                 <route type="mix" sink="hotword input"
-                       sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
                 <route type="mix" sink="incall capture" sources="Voice Call And Telephony Rx" />
                 <route type="mix" sink="voice call rx" sources="Voice Call And Telephony Rx" />
                 <route type="mix" sink="voip_tx"
-                       sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
                 <route type="mix" sink="fast input"
-                       sources="Built-In Mic,USB Device In,USB Headset In"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
                 <route type="mix" sink="mmap_no_irq_in"
-                       sources="Built-In Mic,USB Device In,USB Headset In"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
                 <route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" />
                 <route type="mix" sink="echo_ref_input" sources="Echo Ref In"/>
             </routes>
diff --git a/audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml
index b22a903..c3e64c0 100644
--- a/audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml
+++ b/audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml
@@ -20,6 +20,7 @@
                 <item>Speaker Safe</item>
                 <item>Earpiece</item>
                 <item>Built-In Mic</item>
+                <item>Built-In Back Mic</item>
                 <item>Telephony Tx</item>
                 <item>Voice Call And Telephony Rx</item>
                 <item>Echo Ref In</item>
@@ -186,17 +187,17 @@
                        sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
                 <route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" />
                 <route type="mix" sink="primary input"
-                       sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
                 <route type="mix" sink="hotword input"
-                       sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
                 <route type="mix" sink="incall capture" sources="Voice Call And Telephony Rx" />
                 <route type="mix" sink="voice call rx" sources="Voice Call And Telephony Rx" />
                 <route type="mix" sink="voip_tx"
-                       sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
                 <route type="mix" sink="fast input"
-                       sources="Built-In Mic,USB Device In,USB Headset In"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
                 <route type="mix" sink="mmap_no_irq_in"
-                       sources="Built-In Mic,USB Device In,USB Headset In"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
                 <route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" />
                 <route type="mix" sink="echo_ref_input" sources="Echo Ref In"/>
             </routes>
diff --git a/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml
index a5dafff..d0b1986 100644
--- a/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml
+++ b/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml
@@ -20,6 +20,7 @@
                 <item>Speaker Safe</item>
                 <item>Earpiece</item>
                 <item>Built-In Mic</item>
+                <item>Built-In Back Mic</item>
                 <item>Telephony Tx</item>
                 <item>Voice Call And Telephony Rx</item>
                 <item>Echo Ref In</item>
@@ -186,17 +187,17 @@
                        sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
                 <route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" />
                 <route type="mix" sink="primary input"
-                       sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
                 <route type="mix" sink="hotword input"
-                       sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
                 <route type="mix" sink="incall capture" sources="Voice Call And Telephony Rx" />
                 <route type="mix" sink="voice call rx" sources="Voice Call And Telephony Rx" />
                 <route type="mix" sink="voip_tx"
-                       sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
                 <route type="mix" sink="fast input"
-                       sources="Built-In Mic,USB Device In,USB Headset In"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
                 <route type="mix" sink="mmap_no_irq_in"
-                       sources="Built-In Mic,USB Device In,USB Headset In"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
                 <route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" />
                 <route type="mix" sink="echo_ref_input" sources="Echo Ref In"/>
             </routes>
diff --git a/audio/raven/cs35l41/fw/R-cs35l41-dsp1-spk-prot.bin b/audio/raven/cs35l41/fw/R-cs35l41-dsp1-spk-prot.bin
index 81154a1..efc2407 100644
Binary files a/audio/raven/cs35l41/fw/R-cs35l41-dsp1-spk-prot.bin and b/audio/raven/cs35l41/fw/R-cs35l41-dsp1-spk-prot.bin differ
diff --git a/audio/raven/cs35l41/fw/cs35l41-dsp1-spk-prot.bin b/audio/raven/cs35l41/fw/cs35l41-dsp1-spk-prot.bin
index 30e4cf7..36c4fd1 100644
Binary files a/audio/raven/cs35l41/fw/cs35l41-dsp1-spk-prot.bin and b/audio/raven/cs35l41/fw/cs35l41-dsp1-spk-prot.bin differ
diff --git a/audio/slider/config/audio_policy_configuration.xml b/audio/slider/config/audio_policy_configuration.xml
index 8220e30..42db5e8 100644
--- a/audio/slider/config/audio_policy_configuration.xml
+++ b/audio/slider/config/audio_policy_configuration.xml
@@ -20,6 +20,7 @@
                 <item>Speaker Safe</item>
                 <item>Earpiece</item>
                 <item>Built-In Mic</item>
+                <item>Built-In Back Mic</item>
                 <item>Telephony Tx</item>
                 <item>Voice Call And Telephony Rx</item>
             </attachedDevices>
@@ -199,17 +200,17 @@
                        sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
                 <route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" />
                 <route type="mix" sink="primary input"
-                       sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
                 <route type="mix" sink="hotword input"
-                       sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
                 <route type="mix" sink="incall capture" sources="Voice Call And Telephony Rx" />
                 <route type="mix" sink="voice call rx" sources="Voice Call And Telephony Rx" />
                 <route type="mix" sink="voip_tx"
-                       sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
                 <route type="mix" sink="fast input"
-                       sources="Built-In Mic,USB Device In,USB Headset In"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
                 <route type="mix" sink="mmap_no_irq_in"
-                       sources="Built-In Mic,USB Device In,USB Headset In"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
                 <route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" />
             </routes>
         </module>
diff --git a/audio/slider/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/slider/config/audio_policy_configuration_a2dp_offload_disabled.xml
index 8a9694f..daf5152 100644
--- a/audio/slider/config/audio_policy_configuration_a2dp_offload_disabled.xml
+++ b/audio/slider/config/audio_policy_configuration_a2dp_offload_disabled.xml
@@ -20,6 +20,7 @@
                 <item>Speaker Safe</item>
                 <item>Earpiece</item>
                 <item>Built-In Mic</item>
+                <item>Built-In Back Mic</item>
                 <item>Telephony Tx</item>
                 <item>Voice Call And Telephony Rx</item>
             </attachedDevices>
@@ -178,17 +179,17 @@
                        sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
                 <route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" />
                 <route type="mix" sink="primary input"
-                       sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
                 <route type="mix" sink="hotword input"
-                       sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
                 <route type="mix" sink="incall capture" sources="Voice Call And Telephony Rx" />
                 <route type="mix" sink="voice call rx" sources="Voice Call And Telephony Rx" />
                 <route type="mix" sink="voip_tx"
-                       sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
                 <route type="mix" sink="fast input"
-                       sources="Built-In Mic,USB Device In,USB Headset In"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
                 <route type="mix" sink="mmap_no_irq_in"
-                       sources="Built-In Mic,USB Device In,USB Headset In"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
                 <route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" />
             </routes>
         </module>
diff --git a/audio/slider/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/slider/config/audio_policy_configuration_bluetooth_legacy_hal.xml
index 89b3da2..590b8f0 100644
--- a/audio/slider/config/audio_policy_configuration_bluetooth_legacy_hal.xml
+++ b/audio/slider/config/audio_policy_configuration_bluetooth_legacy_hal.xml
@@ -20,6 +20,7 @@
                 <item>Speaker Safe</item>
                 <item>Earpiece</item>
                 <item>Built-In Mic</item>
+                <item>Built-In Back Mic</item>
                 <item>Telephony Tx</item>
                 <item>Voice Call And Telephony Rx</item>
             </attachedDevices>
@@ -178,17 +179,17 @@
                        sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
                 <route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" />
                 <route type="mix" sink="primary input"
-                       sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
                 <route type="mix" sink="hotword input"
-                       sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
                 <route type="mix" sink="incall capture" sources="Voice Call And Telephony Rx" />
                 <route type="mix" sink="voice call rx" sources="Voice Call And Telephony Rx" />
                 <route type="mix" sink="voip_tx"
-                       sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
                 <route type="mix" sink="fast input"
-                       sources="Built-In Mic,USB Device In,USB Headset In"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
                 <route type="mix" sink="mmap_no_irq_in"
-                       sources="Built-In Mic,USB Device In,USB Headset In"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
                 <route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" />
             </routes>
         </module>
diff --git a/audio/whitefin/config/audio_policy_configuration.xml b/audio/whitefin/config/audio_policy_configuration.xml
index 7c5df64..af5ef8f 100644
--- a/audio/whitefin/config/audio_policy_configuration.xml
+++ b/audio/whitefin/config/audio_policy_configuration.xml
@@ -20,6 +20,7 @@
                 <item>Speaker Safe</item>
                 <item>Earpiece</item>
                 <item>Built-In Mic</item>
+                <item>Built-In Back Mic</item>
                 <item>Telephony Tx</item>
                 <item>Voice Call And Telephony Rx</item>
             </attachedDevices>
@@ -173,17 +174,17 @@
                        sources="primary output,deep buffer,compressed_offload,voip_rx"/>
                 <route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" />
                 <route type="mix" sink="primary input"
-                       sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
                 <route type="mix" sink="hotword input"
-                       sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
                 <route type="mix" sink="incall capture" sources="Voice Call And Telephony Rx" />
                 <route type="mix" sink="voice call rx" sources="Voice Call And Telephony Rx" />
                 <route type="mix" sink="voip_tx"
-                       sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
                 <route type="mix" sink="fast input"
-                       sources="Built-In Mic,USB Device In,USB Headset In"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
                 <route type="mix" sink="mmap_no_irq_in"
-                       sources="Built-In Mic,USB Device In,USB Headset In"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
                 <route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" />
             </routes>
         </module>
diff --git a/audio/whitefin/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/whitefin/config/audio_policy_configuration_a2dp_offload_disabled.xml
index 604ac8f..67ed8ca 100644
--- a/audio/whitefin/config/audio_policy_configuration_a2dp_offload_disabled.xml
+++ b/audio/whitefin/config/audio_policy_configuration_a2dp_offload_disabled.xml
@@ -20,6 +20,7 @@
                 <item>Speaker Safe</item>
                 <item>Earpiece</item>
                 <item>Built-In Mic</item>
+                <item>Built-In Back Mic</item>
                 <item>Telephony Tx</item>
                 <item>Voice Call And Telephony Rx</item>
             </attachedDevices>
@@ -173,17 +174,17 @@
                        sources="primary output,deep buffer,compressed_offload,voip_rx"/>
                 <route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" />
                 <route type="mix" sink="primary input"
-                       sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
                 <route type="mix" sink="hotword input"
-                       sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
                 <route type="mix" sink="incall capture" sources="Voice Call And Telephony Rx" />
                 <route type="mix" sink="voice call rx" sources="Voice Call And Telephony Rx" />
                 <route type="mix" sink="voip_tx"
-                       sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
                 <route type="mix" sink="fast input"
-                       sources="Built-In Mic,USB Device In,USB Headset In"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
                 <route type="mix" sink="mmap_no_irq_in"
-                       sources="Built-In Mic,USB Device In,USB Headset In"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
                 <route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" />
             </routes>
         </module>
diff --git a/audio/whitefin/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/whitefin/config/audio_policy_configuration_bluetooth_legacy_hal.xml
index bc02fe4..c69b318 100644
--- a/audio/whitefin/config/audio_policy_configuration_bluetooth_legacy_hal.xml
+++ b/audio/whitefin/config/audio_policy_configuration_bluetooth_legacy_hal.xml
@@ -20,6 +20,7 @@
                 <item>Speaker Safe</item>
                 <item>Earpiece</item>
                 <item>Built-In Mic</item>
+                <item>Built-In Back Mic</item>
                 <item>Telephony Tx</item>
                 <item>Voice Call And Telephony Rx</item>
             </attachedDevices>
@@ -173,17 +174,17 @@
                        sources="primary output,deep buffer,compressed_offload,voip_rx"/>
                 <route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" />
                 <route type="mix" sink="primary input"
-                       sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
                 <route type="mix" sink="hotword input"
-                       sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
                 <route type="mix" sink="incall capture" sources="Voice Call And Telephony Rx" />
                 <route type="mix" sink="voice call rx" sources="Voice Call And Telephony Rx" />
                 <route type="mix" sink="voip_tx"
-                       sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
                 <route type="mix" sink="fast input"
-                       sources="Built-In Mic,USB Device In,USB Headset In"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
                 <route type="mix" sink="mmap_no_irq_in"
-                       sources="Built-In Mic,USB Device In,USB Headset In"/>
+                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
                 <route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" />
             </routes>
         </module>
diff --git a/oriole/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/oriole/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
index 803765f..21b9084 100644
--- a/oriole/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/oriole/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -31,6 +31,11 @@
     <!-- Doze: whether the double tap sensor reports 2D touch coordinates -->
     <bool name="doze_double_tap_reports_touch_coordinates">true</bool>
 
+    <!-- Doze: only register sensors that use prox when device is in certain Display states. This
+     may delay registering sensors when device first shows dozing UI but the
+     Display & Power state hasn't changed to low-power mode yet. -->
+    <bool name="doze_selectively_register_prox">true</bool>
+
     <!-- Doze: Table that translates sensor values from the doze_brightness_sensor_type sensor
                to brightness values; -1 means keeping the current brightness. -->
     <integer-array name="config_doze_brightness_sensor_to_brightness">
diff --git a/raven/overlay/frameworks/base/core/res/res/values/config.xml b/raven/overlay/frameworks/base/core/res/res/values/config.xml
index 3ae5cb0..11950a9 100644
--- a/raven/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml
@@ -87,6 +87,18 @@
     <!-- The default peak refresh rate. -->
     <integer name="config_defaultPeakRefreshRate">120</integer>
 
+    <!-- Not allow to switch to higher refresh rate when display brightness setting is
+         equal or less than this value -->
+    <integer-array name="config_brightnessThresholdsOfPeakRefreshRate">
+        <item>2</item> <!-- 15% UI brightness -->
+    </integer-array>
+    <integer-array name="config_ambientThresholdsOfPeakRefreshRate">
+        <item>5</item>
+    </integer-array>
+
+    <!-- default refresh rate in the zone defined by birghtness and ambient thresholds -->
+    <integer name="config_defaultRefreshRateInZone">120</integer>
+
     <!-- Array of light sensor LUX values to define our levels for auto backlight brightness support.
       The N entries of this array define N  1 zones as follows:
          Zone 0:        0 <= LUX < array[0]
diff --git a/raven/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/raven/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
index b848b8c..a5bb8e3 100644
--- a/raven/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/raven/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -31,6 +31,11 @@
     <!-- Doze: whether the double tap sensor reports 2D touch coordinates -->
     <bool name="doze_double_tap_reports_touch_coordinates">true</bool>
 
+    <!-- Doze: only register sensors that use prox when device is in certain Display states. This
+     may delay registering sensors when device first shows dozing UI but the
+     Display & Power state hasn't changed to low-power mode yet. -->
+    <bool name="doze_selectively_register_prox">true</bool>
+
     <!-- Doze: Table that translates sensor values from the doze_brightness_sensor_type sensor
                to brightness values; -1 means keeping the current brightness. -->
     <integer-array name="config_doze_brightness_sensor_to_brightness">
diff --git a/thermal_info_config_oriole.json b/thermal_info_config_oriole.json
index f08234d..3e9022e 100644
--- a/thermal_info_config_oriole.json
+++ b/thermal_info_config_oriole.json
@@ -695,6 +695,22 @@
                 }
             ]
         },
+        {
+            "Name":"batoilo",
+            "Type":"BCL_CURRENT",
+            "HotThreshold":[
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                5000,
+                "NAN",
+                "NAN"
+            ],
+            "VrThreshold":"NAN",
+            "Multiplier":1,
+            "Monitor":true
+        },
         {
             "Name":"vdroop1",
             "Type":"BCL_VOLTAGE",
@@ -751,13 +767,13 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                7,
+                7000,
                 "NAN",
                 "NAN"
             ],
             "VrThreshold":"NAN",
-            "Multiplier":0.001,
-            "Monitor":false
+            "Multiplier":1,
+            "Monitor":true
         },
         {
             "Name":"ocp_cpu2",
@@ -767,13 +783,13 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                12,
+                12000,
                 "NAN",
                 "NAN"
             ],
             "VrThreshold":"NAN",
-            "Multiplier":0.001,
-            "Monitor":false
+            "Multiplier":1,
+            "Monitor":true
         },
         {
             "Name":"ocp_tpu",
@@ -783,13 +799,13 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                10.5,
+                10500,
                 "NAN",
                 "NAN"
             ],
             "VrThreshold":"NAN",
-            "Multiplier":0.001,
-            "Monitor":false
+            "Multiplier":1,
+            "Monitor":true
         },
         {
             "Name":"ocp_gpu",
@@ -799,13 +815,13 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                12,
+                12000,
                 "NAN",
                 "NAN"
             ],
             "VrThreshold":"NAN",
-            "Multiplier":0.001,
-            "Monitor":false
+            "Multiplier":1,
+            "Monitor":true
         },
         {
             "Name":"soft_ocp_cpu2",
@@ -815,13 +831,13 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                9,
+                9000,
                 "NAN",
                 "NAN"
             ],
             "VrThreshold":"NAN",
-            "Multiplier":0.001,
-            "Monitor":false
+            "Multiplier":1,
+            "Monitor":true
         },
         {
             "Name":"soft_ocp_cpu1",
@@ -831,13 +847,13 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                7.00,
+                7000,
                 "NAN",
                 "NAN"
             ],
             "VrThreshold":"NAN",
-            "Multiplier":0.001,
-            "Monitor":false
+            "Multiplier":1,
+            "Monitor":true
         },
         {
             "Name":"soft_ocp_tpu",
@@ -847,13 +863,13 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                8.5,
+                8500,
                 "NAN",
                 "NAN"
             ],
             "VrThreshold":"NAN",
-            "Multiplier":0.001,
-            "Monitor":false
+            "Multiplier":1,
+            "Monitor":true
         },
         {
             "Name":"soft_ocp_gpu",
@@ -863,13 +879,13 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                9,
+                9000,
                 "NAN",
                 "NAN"
             ],
             "VrThreshold":"NAN",
-            "Multiplier":0.001,
-            "Monitor":false
+            "Multiplier":1,
+            "Monitor":true
         },
         {
             "Name":"TPU",
diff --git a/thermal_info_config_oriole_WHI_A.json b/thermal_info_config_oriole_WHI_A.json
index 4b4f17d..c0597b5 100644
--- a/thermal_info_config_oriole_WHI_A.json
+++ b/thermal_info_config_oriole_WHI_A.json
@@ -384,6 +384,22 @@
                 }
             ]
         },
+        {
+            "Name":"batoilo",
+            "Type":"BCL_CURRENT",
+            "HotThreshold":[
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                5000,
+                "NAN",
+                "NAN"
+            ],
+            "VrThreshold":"NAN",
+            "Multiplier":1,
+            "Monitor":true
+        },
         {
             "Name":"vdroop1",
             "Type":"BCL_VOLTAGE",
@@ -446,7 +462,7 @@
             ],
             "VrThreshold":"NAN",
             "Multiplier":0.001,
-            "Monitor":false
+            "Monitor":true
         },
         {
             "Name":"ocp_cpu2",
@@ -456,13 +472,13 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                12,
+                12000,
                 "NAN",
                 "NAN"
             ],
             "VrThreshold":"NAN",
-            "Multiplier":0.001,
-            "Monitor":false
+            "Multiplier":1,
+            "Monitor":true
         },
         {
             "Name":"ocp_tpu",
@@ -472,13 +488,13 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                10.5,
+                10500,
                 "NAN",
                 "NAN"
             ],
             "VrThreshold":"NAN",
-            "Multiplier":0.001,
-            "Monitor":false
+            "Multiplier":1,
+            "Monitor":true
         },
         {
             "Name":"ocp_gpu",
@@ -488,13 +504,13 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                12,
+                12000,
                 "NAN",
                 "NAN"
             ],
             "VrThreshold":"NAN",
-            "Multiplier":0.001,
-            "Monitor":false
+            "Multiplier":1,
+            "Monitor":true
         },
         {
             "Name":"soft_ocp_cpu2",
@@ -504,13 +520,13 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                9,
+                9000,
                 "NAN",
                 "NAN"
             ],
             "VrThreshold":"NAN",
-            "Multiplier":0.001,
-            "Monitor":false
+            "Multiplier":1,
+            "Monitor":true
         },
         {
             "Name":"soft_ocp_cpu1",
@@ -520,13 +536,13 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                7.00,
+                7000,
                 "NAN",
                 "NAN"
             ],
             "VrThreshold":"NAN",
-            "Multiplier":0.001,
-            "Monitor":false
+            "Multiplier":1,
+            "Monitor":true
         },
         {
             "Name":"soft_ocp_tpu",
@@ -536,13 +552,13 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                8.5,
+                8500,
                 "NAN",
                 "NAN"
             ],
             "VrThreshold":"NAN",
-            "Multiplier":0.001,
-            "Monitor":false
+            "Multiplier":1,
+            "Monitor":true
         },
         {
             "Name":"soft_ocp_gpu",
@@ -552,13 +568,13 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                9,
+                9000,
                 "NAN",
                 "NAN"
             ],
             "VrThreshold":"NAN",
-            "Multiplier":0.001,
-            "Monitor":false
+            "Multiplier":1,
+            "Monitor":true
         },
         {
             "Name":"TPU",
diff --git a/thermal_info_config_raven.json b/thermal_info_config_raven.json
index 3203be9..5d59943 100644
--- a/thermal_info_config_raven.json
+++ b/thermal_info_config_raven.json
@@ -695,6 +695,22 @@
                 }
             ]
         },
+        {
+            "Name":"batoilo",
+            "Type":"BCL_CURRENT",
+            "HotThreshold":[
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                5000,
+                "NAN",
+                "NAN"
+            ],
+            "VrThreshold":"NAN",
+            "Multiplier":1,
+            "Monitor":true
+        },
         {
             "Name":"vdroop1",
             "Type":"BCL_VOLTAGE",
@@ -751,13 +767,13 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                7,
+                7000,
                 "NAN",
                 "NAN"
             ],
             "VrThreshold":"NAN",
-            "Multiplier":0.001,
-            "Monitor":false
+            "Multiplier":1,
+            "Monitor":true
         },
         {
             "Name":"ocp_cpu2",
@@ -767,13 +783,13 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                12,
+                12000,
                 "NAN",
                 "NAN"
             ],
             "VrThreshold":"NAN",
-            "Multiplier":0.001,
-            "Monitor":false
+            "Multiplier":1,
+            "Monitor":true
         },
         {
             "Name":"ocp_tpu",
@@ -783,13 +799,13 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                10.5,
+                10500,
                 "NAN",
                 "NAN"
             ],
             "VrThreshold":"NAN",
-            "Multiplier":0.001,
-            "Monitor":false
+            "Multiplier":1,
+            "Monitor":true
         },
         {
             "Name":"ocp_gpu",
@@ -799,13 +815,13 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                12,
+                12000,
                 "NAN",
                 "NAN"
             ],
             "VrThreshold":"NAN",
-            "Multiplier":0.001,
-            "Monitor":false
+            "Multiplier":1,
+            "Monitor":true
         },
         {
             "Name":"soft_ocp_cpu2",
@@ -815,13 +831,13 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                9,
+                9000,
                 "NAN",
                 "NAN"
             ],
             "VrThreshold":"NAN",
-            "Multiplier":0.001,
-            "Monitor":false
+            "Multiplier":1,
+            "Monitor":true
         },
         {
             "Name":"soft_ocp_cpu1",
@@ -831,13 +847,13 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                7.00,
+                7000,
                 "NAN",
                 "NAN"
             ],
             "VrThreshold":"NAN",
-            "Multiplier":0.001,
-            "Monitor":false
+            "Multiplier":1,
+            "Monitor":true
         },
         {
             "Name":"soft_ocp_tpu",
@@ -847,13 +863,13 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                8.5,
+                8500,
                 "NAN",
                 "NAN"
             ],
             "VrThreshold":"NAN",
-            "Multiplier":0.001,
-            "Monitor":false
+            "Multiplier":1,
+            "Monitor":true
         },
         {
             "Name":"soft_ocp_gpu",
@@ -863,13 +879,13 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                9,
+                9000,
                 "NAN",
                 "NAN"
             ],
             "VrThreshold":"NAN",
-            "Multiplier":0.001,
-            "Monitor":false
+            "Multiplier":1,
+            "Monitor":true
         },
         {
             "Name":"TPU",