diff --git a/aosp_husky_pgagnostic.mk b/aosp_husky_pgagnostic.mk
index f633834..50a3f3f 100644
--- a/aosp_husky_pgagnostic.mk
+++ b/aosp_husky_pgagnostic.mk
@@ -22,4 +22,5 @@ PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true
 PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 16384
 
 TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
+TARGET_RW_FILE_SYSTEM_TYPE := ext4
 TARGET_BOOTS_16K := true
diff --git a/aosp_shiba_pgagnostic.mk b/aosp_shiba_pgagnostic.mk
index 0b23ed5..208ee17 100644
--- a/aosp_shiba_pgagnostic.mk
+++ b/aosp_shiba_pgagnostic.mk
@@ -22,4 +22,5 @@ PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true
 PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 16384
 
 TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
+TARGET_RW_FILE_SYSTEM_TYPE := ext4
 TARGET_BOOTS_16K := true
diff --git a/audio/husky/config/bluetooth_with_le_audio_policy_configuration_7_0.xml b/audio/husky/config/bluetooth_with_le_audio_policy_configuration_7_0.xml
index 8b2af59..efd7277 100644
--- a/audio/husky/config/bluetooth_with_le_audio_policy_configuration_7_0.xml
+++ b/audio/husky/config/bluetooth_with_le_audio_policy_configuration_7_0.xml
@@ -11,6 +11,7 @@
                      channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
         </mixPort>
         <!-- Le Audio Audio Ports -->
+        <mixPort name="le audio broadcast output" role="source" />
         <mixPort name="le audio output" role="source" flags="AUDIO_OUTPUT_FLAG_SPATIALIZER">
             <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                      samplingRates="44100 48000"
@@ -51,6 +52,7 @@
         <devicePort tagName="BLE Headset Out" type="AUDIO_DEVICE_OUT_BLE_HEADSET" role="sink"/>
         <devicePort tagName="BLE Speaker Out" type="AUDIO_DEVICE_OUT_BLE_SPEAKER" role="sink"/>
         <devicePort tagName="BLE Headset In" type="AUDIO_DEVICE_IN_BLE_HEADSET" role="source"/>
+        <devicePort tagName="BLE Broadcast Out" type="AUDIO_DEVICE_OUT_BLE_BROADCAST" role="sink"/>
     </devicePorts>
     <routes>
         <route type="mix" sink="BT A2DP Out"
@@ -66,6 +68,8 @@
         <route type="mix" sink="le audio input"
                sources="BLE Headset In"/>
         <route type="mix" sink="BLE Speaker Out"
-               sources="le audio output"/>
+            sources="le audio output"/>
+        <route type="mix" sink="BLE Broadcast Out"
+            sources="le audio broadcast output"/>
     </routes>
 </module>
\ No newline at end of file
diff --git a/audio/ripcurrent/config/bluetooth_with_le_audio_policy_configuration_7_0.xml b/audio/ripcurrent/config/bluetooth_with_le_audio_policy_configuration_7_0.xml
index 8b2af59..efd7277 100644
--- a/audio/ripcurrent/config/bluetooth_with_le_audio_policy_configuration_7_0.xml
+++ b/audio/ripcurrent/config/bluetooth_with_le_audio_policy_configuration_7_0.xml
@@ -11,6 +11,7 @@
                      channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
         </mixPort>
         <!-- Le Audio Audio Ports -->
+        <mixPort name="le audio broadcast output" role="source" />
         <mixPort name="le audio output" role="source" flags="AUDIO_OUTPUT_FLAG_SPATIALIZER">
             <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                      samplingRates="44100 48000"
@@ -51,6 +52,7 @@
         <devicePort tagName="BLE Headset Out" type="AUDIO_DEVICE_OUT_BLE_HEADSET" role="sink"/>
         <devicePort tagName="BLE Speaker Out" type="AUDIO_DEVICE_OUT_BLE_SPEAKER" role="sink"/>
         <devicePort tagName="BLE Headset In" type="AUDIO_DEVICE_IN_BLE_HEADSET" role="source"/>
+        <devicePort tagName="BLE Broadcast Out" type="AUDIO_DEVICE_OUT_BLE_BROADCAST" role="sink"/>
     </devicePorts>
     <routes>
         <route type="mix" sink="BT A2DP Out"
@@ -66,6 +68,8 @@
         <route type="mix" sink="le audio input"
                sources="BLE Headset In"/>
         <route type="mix" sink="BLE Speaker Out"
-               sources="le audio output"/>
+            sources="le audio output"/>
+        <route type="mix" sink="BLE Broadcast Out"
+            sources="le audio broadcast output"/>
     </routes>
 </module>
\ No newline at end of file
diff --git a/audio/shiba/config/bluetooth_with_le_audio_policy_configuration_7_0.xml b/audio/shiba/config/bluetooth_with_le_audio_policy_configuration_7_0.xml
index 8b2af59..efd7277 100644
--- a/audio/shiba/config/bluetooth_with_le_audio_policy_configuration_7_0.xml
+++ b/audio/shiba/config/bluetooth_with_le_audio_policy_configuration_7_0.xml
@@ -11,6 +11,7 @@
                      channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
         </mixPort>
         <!-- Le Audio Audio Ports -->
+        <mixPort name="le audio broadcast output" role="source" />
         <mixPort name="le audio output" role="source" flags="AUDIO_OUTPUT_FLAG_SPATIALIZER">
             <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                      samplingRates="44100 48000"
@@ -51,6 +52,7 @@
         <devicePort tagName="BLE Headset Out" type="AUDIO_DEVICE_OUT_BLE_HEADSET" role="sink"/>
         <devicePort tagName="BLE Speaker Out" type="AUDIO_DEVICE_OUT_BLE_SPEAKER" role="sink"/>
         <devicePort tagName="BLE Headset In" type="AUDIO_DEVICE_IN_BLE_HEADSET" role="source"/>
+        <devicePort tagName="BLE Broadcast Out" type="AUDIO_DEVICE_OUT_BLE_BROADCAST" role="sink"/>
     </devicePorts>
     <routes>
         <route type="mix" sink="BT A2DP Out"
@@ -66,6 +68,8 @@
         <route type="mix" sink="le audio input"
                sources="BLE Headset In"/>
         <route type="mix" sink="BLE Speaker Out"
-               sources="le audio output"/>
+            sources="le audio output"/>
+        <route type="mix" sink="BLE Broadcast Out"
+            sources="le audio broadcast output"/>
     </routes>
 </module>
\ No newline at end of file