diff --git a/groups/audio/audio_base_aaos/default/policy/audio_hal_configuration.xml b/groups/audio/audio_base_aaos/default/policy/audio_hal_configuration.xml
index 77a2cc568..0088c0d35 100644
--- a/groups/audio/audio_base_aaos/default/policy/audio_hal_configuration.xml
+++ b/groups/audio/audio_base_aaos/default/policy/audio_hal_configuration.xml
@@ -10,28 +10,19 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/groups/audio/audio_base_aaos/default/policy/audio_policy_configuration_attached_devices.xml b/groups/audio/audio_base_aaos/default/policy/audio_policy_configuration_attached_devices.xml
index 04aab60d0..8ef815a76 100644
--- a/groups/audio/audio_base_aaos/default/policy/audio_policy_configuration_attached_devices.xml
+++ b/groups/audio/audio_base_aaos/default/policy/audio_policy_configuration_attached_devices.xml
@@ -16,13 +16,8 @@
- bus0_media_out
- - bus1_navigation_out
- - bus2_voice_command_out
- bus3_call_ring_out
- bus4_call_out
- - bus5_alarm_out
- - bus6_notification_out
- - bus7_system_sound_out
- bus_1000_input_zone_0
diff --git a/groups/audio/audio_base_aaos/default/policy/audio_policy_configuration_devices.xml b/groups/audio/audio_base_aaos/default/policy/audio_policy_configuration_devices.xml
index 3d7438697..5d84c5b43 100644
--- a/groups/audio/audio_base_aaos/default/policy/audio_policy_configuration_devices.xml
+++ b/groups/audio/audio_base_aaos/default/policy/audio_policy_configuration_devices.xml
@@ -25,26 +25,6 @@
defaultValueMB="0" stepValueMB="100"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/groups/audio/audio_base_aaos/default/policy/car_audio_configuration.xml b/groups/audio/audio_base_aaos/default/policy/car_audio_configuration.xml
index dfa2b18f8..c6e340f9d 100644
--- a/groups/audio/audio_base_aaos/default/policy/car_audio_configuration.xml
+++ b/groups/audio/audio_base_aaos/default/policy/car_audio_configuration.xml
@@ -29,40 +29,29 @@
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
diff --git a/groups/multi-passenger/true/audio/audio_hal_configuration.xml b/groups/multi-passenger/true/audio/audio_hal_configuration.xml
index e55e34de6..2b5151b22 100644
--- a/groups/multi-passenger/true/audio/audio_hal_configuration.xml
+++ b/groups/multi-passenger/true/audio/audio_hal_configuration.xml
@@ -22,17 +22,11 @@
-
-
-
-
-
-
-
-
-
+
+
+
@@ -43,4 +37,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/groups/multi-passenger/true/audio/audio_policy_configuration_attached_devices.xml b/groups/multi-passenger/true/audio/audio_policy_configuration_attached_devices.xml
index 9bc1d3ff4..5e92b63c4 100644
--- a/groups/multi-passenger/true/audio/audio_policy_configuration_attached_devices.xml
+++ b/groups/multi-passenger/true/audio/audio_policy_configuration_attached_devices.xml
@@ -20,9 +20,6 @@
- bus2_voice_command_out
- bus3_call_ring_out
- bus4_call_out
- - bus5_alarm_out
- - bus6_notification_out
- - bus7_system_sound_out
- bus_1000_input_zone_0
@@ -42,4 +39,16 @@
- bus_2000_input_zone_1
+
+
+ - bus200_audio_zone_2
+
+
+ - bus_3000_input_zone_2
+
+
+ - bus300_audio_zone_3
+
+
+ - bus_4000_input_zone_3
diff --git a/groups/multi-passenger/true/audio/audio_policy_configuration_devices.xml b/groups/multi-passenger/true/audio/audio_policy_configuration_devices.xml
index ec68461ab..dd7f0d730 100644
--- a/groups/multi-passenger/true/audio/audio_policy_configuration_devices.xml
+++ b/groups/multi-passenger/true/audio/audio_policy_configuration_devices.xml
@@ -14,7 +14,7 @@
limitations under the License.
-->
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/groups/multi-passenger/true/audio/audio_policy_configuration_mixports.xml b/groups/multi-passenger/true/audio/audio_policy_configuration_mixports.xml
index f64850427..dd08450a4 100644
--- a/groups/multi-passenger/true/audio/audio_policy_configuration_mixports.xml
+++ b/groups/multi-passenger/true/audio/audio_policy_configuration_mixports.xml
@@ -40,21 +40,6 @@
samplingRates="48000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/groups/multi-passenger/true/audio/audio_policy_configuration_routes.xml b/groups/multi-passenger/true/audio/audio_policy_configuration_routes.xml
index e135070f0..1801a7800 100644
--- a/groups/multi-passenger/true/audio/audio_policy_configuration_routes.xml
+++ b/groups/multi-passenger/true/audio/audio_policy_configuration_routes.xml
@@ -36,14 +36,22 @@
sources="mixport_bus2_voice_command_out"/>
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/groups/multi-passenger/true/audio/car_audio_configuration.xml b/groups/multi-passenger/true/audio/car_audio_configuration.xml
index 9a103cb89..870e167a1 100644
--- a/groups/multi-passenger/true/audio/car_audio_configuration.xml
+++ b/groups/multi-passenger/true/audio/car_audio_configuration.xml
@@ -29,9 +29,11 @@
-
-
-
+
+
+
+
+
@@ -46,23 +48,16 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
@@ -87,7 +82,53 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/groups/multi-passenger/true/product.mk b/groups/multi-passenger/true/product.mk
index 5bf0e98b0..a432b88f5 100644
--- a/groups/multi-passenger/true/product.mk
+++ b/groups/multi-passenger/true/product.mk
@@ -31,7 +31,7 @@ PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/audio/audio_policy_configuration_mixports.xml:vendor/etc/audio_policy_configuration_mixports.xml \
$(LOCAL_PATH)/audio/audio_policy_configuration_routes.xml:vendor/etc/audio_policy_configuration_routes.xml \
$(LOCAL_PATH)/audio/audio_hal_configuration.xml:vendor/etc/audio_hal_configuration.xml \
- $(LOCAL_PATH)/audio/audio_hal_configuration_intel_poc.xml:vendor/etc/audio_hal_configuration_intel_poc.xml
+ $(LOCAL_PATH)/audio/audio_hal_configuration_intel_poc.xml:vendor/etc/audio_hal_configuration_intel_poc.xml
endif
PRODUCT_COPY_FILES += \