diff --git a/audio/husky/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/husky/config/audio_policy_configuration_a2dp_offload_disabled.xml
index 78b7ee8..4878bc5 100644
--- a/audio/husky/config/audio_policy_configuration_a2dp_offload_disabled.xml
+++ b/audio/husky/config/audio_policy_configuration_a2dp_offload_disabled.xml
@@ -149,7 +149,7 @@
                 </devicePort>
                 <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
                 </devicePort>
-                <devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
+                <devicePort tagName="HDMI Out" type="AUDIO_DEVICE_OUT_HDMI" role="sink">
                 </devicePort>
                 <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
                 </devicePort>
@@ -184,6 +184,8 @@
                        sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/>
                 <route type="mix" sink="USB Headset Out"
                        sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/>
+                <route type="mix" sink="HDMI Out"
+                       sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/>
                 <route type="mix" sink="BT SCO"
                        sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO Headset"
diff --git a/audio/husky/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/husky/config/audio_policy_configuration_bluetooth_legacy_hal.xml
index 0b1ddda..5c5602c 100644
--- a/audio/husky/config/audio_policy_configuration_bluetooth_legacy_hal.xml
+++ b/audio/husky/config/audio_policy_configuration_bluetooth_legacy_hal.xml
@@ -145,7 +145,7 @@
                 </devicePort>
                 <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
                 </devicePort>
-                <devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
+                <devicePort tagName="HDMI Out" type="AUDIO_DEVICE_OUT_HDMI" role="sink">
                 </devicePort>
                 <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
                 </devicePort>
@@ -180,6 +180,8 @@
                        sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback"/>
                 <route type="mix" sink="USB Headset Out"
                        sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback"/>
+                <route type="mix" sink="HDMI Out"
+                       sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx"/>
                 <route type="mix" sink="BT SCO"
                        sources="primary output,deep buffer,haptic,voip_rx,raw,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO Headset"
diff --git a/audio/husky/config/audio_policy_configuration_le_offload_disabled.xml b/audio/husky/config/audio_policy_configuration_le_offload_disabled.xml
index e7552f0..25bac3d 100644
--- a/audio/husky/config/audio_policy_configuration_le_offload_disabled.xml
+++ b/audio/husky/config/audio_policy_configuration_le_offload_disabled.xml
@@ -149,7 +149,7 @@
                 </devicePort>
                 <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
                 </devicePort>
-                <devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
+                <devicePort tagName="HDMI Out" type="AUDIO_DEVICE_OUT_HDMI" role="sink">
                 </devicePort>
                 <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
                 </devicePort>
@@ -205,6 +205,8 @@
                        sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/>
                 <route type="mix" sink="USB Headset Out"
                        sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/>
+                <route type="mix" sink="HDMI Out"
+                       sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/>
                 <route type="mix" sink="BT SCO"
                        sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO Headset"
diff --git a/audio/shiba/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/shiba/config/audio_policy_configuration_a2dp_offload_disabled.xml
index 78b7ee8..4878bc5 100644
--- a/audio/shiba/config/audio_policy_configuration_a2dp_offload_disabled.xml
+++ b/audio/shiba/config/audio_policy_configuration_a2dp_offload_disabled.xml
@@ -149,7 +149,7 @@
                 </devicePort>
                 <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
                 </devicePort>
-                <devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
+                <devicePort tagName="HDMI Out" type="AUDIO_DEVICE_OUT_HDMI" role="sink">
                 </devicePort>
                 <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
                 </devicePort>
@@ -184,6 +184,8 @@
                        sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/>
                 <route type="mix" sink="USB Headset Out"
                        sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/>
+                <route type="mix" sink="HDMI Out"
+                       sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/>
                 <route type="mix" sink="BT SCO"
                        sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO Headset"
diff --git a/audio/shiba/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/shiba/config/audio_policy_configuration_bluetooth_legacy_hal.xml
index 0b1ddda..5c5602c 100644
--- a/audio/shiba/config/audio_policy_configuration_bluetooth_legacy_hal.xml
+++ b/audio/shiba/config/audio_policy_configuration_bluetooth_legacy_hal.xml
@@ -145,7 +145,7 @@
                 </devicePort>
                 <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
                 </devicePort>
-                <devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
+                <devicePort tagName="HDMI Out" type="AUDIO_DEVICE_OUT_HDMI" role="sink">
                 </devicePort>
                 <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
                 </devicePort>
@@ -180,6 +180,8 @@
                        sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback"/>
                 <route type="mix" sink="USB Headset Out"
                        sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback"/>
+                <route type="mix" sink="HDMI Out"
+                       sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx"/>
                 <route type="mix" sink="BT SCO"
                        sources="primary output,deep buffer,haptic,voip_rx,raw,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO Headset"
diff --git a/audio/shiba/config/audio_policy_configuration_le_offload_disabled.xml b/audio/shiba/config/audio_policy_configuration_le_offload_disabled.xml
index e7552f0..25bac3d 100644
--- a/audio/shiba/config/audio_policy_configuration_le_offload_disabled.xml
+++ b/audio/shiba/config/audio_policy_configuration_le_offload_disabled.xml
@@ -149,7 +149,7 @@
                 </devicePort>
                 <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
                 </devicePort>
-                <devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
+                <devicePort tagName="HDMI Out" type="AUDIO_DEVICE_OUT_HDMI" role="sink">
                 </devicePort>
                 <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
                 </devicePort>
@@ -205,6 +205,8 @@
                        sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/>
                 <route type="mix" sink="USB Headset Out"
                        sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/>
+                <route type="mix" sink="HDMI Out"
+                       sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/>
                 <route type="mix" sink="BT SCO"
                        sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO Headset"
diff --git a/bluetooth/le_audio_codec_capabilities.xml b/bluetooth/le_audio_codec_capabilities.xml
index 9dcdd01..f277589 100644
--- a/bluetooth/le_audio_codec_capabilities.xml
+++ b/bluetooth/le_audio_codec_capabilities.xml
@@ -47,6 +47,8 @@
     <scenario encode="TwoChanStereo_32_2" decode="OneChanMono_32_2"/>
     <scenario encode="OneChanMono_32_2" decode="OneChanMono_32_2"/>
     <!-- broadcast -->
+    <scenario encode="invalid" decode="invalid" broadcast="BcastStereo_48_4"/>
+    <scenario encode="invalid" decode="invalid" broadcast="BcastStereo_48_2"/>
     <scenario encode="invalid" decode="invalid" broadcast="BcastStereo_24_2"/>
     <scenario encode="invalid" decode="invalid" broadcast="BcastStereo_16_2"/>
   </scenarioList>
@@ -65,6 +67,8 @@
     <configuration name="OneChanMono_48_4" codecConfiguration="LC3_48k_4" strategyConfiguration="MONO_ONE_CIS_PER_DEVICE"/>
     <configuration name="TwoChanStereo_48_4" codecConfiguration="LC3_48k_4" strategyConfiguration="STEREO_TWO_CISES_PER_DEVICE"/>
     <configuration name="OneChanStereo_48_4" codecConfiguration="LC3_48k_4" strategyConfiguration="STEREO_ONE_CIS_PER_DEVICE"/>
+    <configuration name="BcastStereo_48_4" codecConfiguration="LC3_48k_4" strategyConfiguration="BROADCAST_STEREO"/>
+    <configuration name="BcastStereo_48_2" codecConfiguration="LC3_48k_2" strategyConfiguration="BROADCAST_STEREO"/>
     <configuration name="BcastStereo_24_2" codecConfiguration="LC3_24k_2" strategyConfiguration="BROADCAST_STEREO"/>
     <configuration name="BcastStereo_16_2" codecConfiguration="LC3_16k_2" strategyConfiguration="BROADCAST_STEREO"/>
   </configurationList>
@@ -73,6 +77,7 @@
     <codecConfiguration name="LC3_16k_2" codec="LC3" samplingFrequency="16000" frameDurationUs="10000" octetsPerCodecFrame="40"/>
     <codecConfiguration name="LC3_24k_2" codec="LC3" samplingFrequency="24000" frameDurationUs="10000" octetsPerCodecFrame="60"/>
     <codecConfiguration name="LC3_32k_2" codec="LC3" samplingFrequency="32000" frameDurationUs="10000" octetsPerCodecFrame="80"/>
+    <codecConfiguration name="LC3_48k_2" codec="LC3" samplingFrequency="48000" frameDurationUs="10000" octetsPerCodecFrame="100"/>
     <codecConfiguration name="LC3_48k_4" codec="LC3" samplingFrequency="48000" frameDurationUs="10000" octetsPerCodecFrame="120"/>
   </codecConfigurationList>
   <strategyConfigurationList>
diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json
index d288d84..45053cd 100644
--- a/perf/powerhint-husky.json
+++ b/perf/powerhint-husky.json
@@ -754,18 +754,23 @@
       "Name": "VIRTUAL-SKIN-CPU-MID",
       "Path": "vendor.thermal.VIRTUAL-SKIN-CPU-MID.profile",
       "Values": [
-        "game",
-        ""
+        "",
+        "game"
       ],
+      "DefaultIndex": 0,
+      "ResetOnInit": true,
       "Type": "Property"
     },
     {
       "Name": "VIRTUAL-SKIN-CPU-HIGH",
       "Path": "vendor.thermal.VIRTUAL-SKIN-CPU-HIGH.profile",
       "Values": [
+        "",
         "game",
-        ""
+        "camera"
       ],
+      "DefaultIndex": 0,
+      "ResetOnInit": true,
       "Type": "Property"
     },
     {
@@ -1519,6 +1524,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_EXTREME",
+      "Node": "VIRTUAL-SKIN-CPU-HIGH",
+      "Duration": 0,
+      "Value": "camera"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "PowerHALCameraRunning",
@@ -1663,6 +1674,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_HIGH",
+      "Node": "VIRTUAL-SKIN-CPU-HIGH",
+      "Duration": 0,
+      "Value": "camera"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PowerHALCameraRunning",
@@ -1789,6 +1806,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_STANDARD",
+      "Node": "VIRTUAL-SKIN-CPU-HIGH",
+      "Duration": 0,
+      "Value": "camera"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_LOW",
       "Node": "PowerHALCameraRunning",
diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json
index be39284..51beaab 100644
--- a/perf/powerhint-shiba.json
+++ b/perf/powerhint-shiba.json
@@ -754,18 +754,23 @@
       "Name": "VIRTUAL-SKIN-CPU-MID",
       "Path": "vendor.thermal.VIRTUAL-SKIN-CPU-MID.profile",
       "Values": [
-        "game",
-        ""
+        "",
+        "game"
       ],
+      "DefaultIndex": 0,
+      "ResetOnInit": true,
       "Type": "Property"
     },
     {
       "Name": "VIRTUAL-SKIN-CPU-HIGH",
       "Path": "vendor.thermal.VIRTUAL-SKIN-CPU-HIGH.profile",
       "Values": [
+        "",
         "game",
-        ""
+        "camera"
       ],
+      "DefaultIndex": 0,
+      "ResetOnInit": true,
       "Type": "Property"
     },
     {
@@ -1417,6 +1422,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_EXTREME",
+      "Node": "VIRTUAL-SKIN-CPU-HIGH",
+      "Duration": 0,
+      "Value": "camera"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "PowerHALCameraRunning",
@@ -1561,6 +1572,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_HIGH",
+      "Node": "VIRTUAL-SKIN-CPU-HIGH",
+      "Duration": 0,
+      "Value": "camera"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PowerHALCameraRunning",
@@ -1687,6 +1704,12 @@
       "Duration": 0,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_STANDARD",
+      "Node": "VIRTUAL-SKIN-CPU-HIGH",
+      "Duration": 0,
+      "Value": "camera"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_LOW",
       "Node": "PowerHALCameraRunning",
diff --git a/thermal/thermal_info_config_husky.json b/thermal/thermal_info_config_husky.json
index 86e317e..f69738f 100644
--- a/thermal/thermal_info_config_husky.json
+++ b/thermal/thermal_info_config_husky.json
@@ -531,17 +531,37 @@
                         {
                            "CdevRequest": "thermal-cpufreq-0",
                            "MaxReleaseStep": 1,
-			   "Disabled":true
+                           "Disabled":true
                         },
                         {
                            "CdevRequest": "thermal-cpufreq-1",
                            "MaxReleaseStep": 1,
-			   "Disabled":true
+                           "Disabled":true
                         },
                         {
                            "CdevRequest": "thermal-cpufreq-2",
                            "MaxReleaseStep": 1,
-			   "Disabled":true
+                           "Disabled":true
+                        }
+                    ]
+                },
+                {
+                    "Mode": "camera",
+                    "BindedCdevInfo": [
+                        {
+                           "CdevRequest": "thermal-cpufreq-0",
+                           "MaxReleaseStep": 1,
+                           "Disabled":true
+                        },
+                        {
+                           "CdevRequest": "thermal-cpufreq-1",
+                           "MaxReleaseStep": 1,
+                           "Disabled":true
+                        },
+                        {
+                           "CdevRequest": "thermal-cpufreq-2",
+                           "MaxReleaseStep": 1,
+                           "Disabled":true
                         }
                     ]
                 }
diff --git a/thermal/thermal_info_config_shiba.json b/thermal/thermal_info_config_shiba.json
index 2e37654..9c71dbe 100644
--- a/thermal/thermal_info_config_shiba.json
+++ b/thermal/thermal_info_config_shiba.json
@@ -512,6 +512,26 @@
                            "Disabled":true
                         }
                     ]
+                },
+                {
+                    "Mode": "camera",
+                    "BindedCdevInfo": [
+                        {
+                           "CdevRequest": "thermal-cpufreq-0",
+                           "MaxReleaseStep": 1,
+                           "Disabled":true
+                        },
+                        {
+                           "CdevRequest": "thermal-cpufreq-1",
+                           "MaxReleaseStep": 1,
+                           "Disabled":true
+                        },
+                        {
+                           "CdevRequest": "thermal-cpufreq-2",
+                           "MaxReleaseStep": 1,
+                           "Disabled":true
+                        }
+                    ]
                 }
             ]
         },