diff --git a/configs/msmnile_au/msmnile_au.mk b/configs/msmnile_au/msmnile_au.mk
index 2f6824ed..fab710fc 100644
--- a/configs/msmnile_au/msmnile_au.mk
+++ b/configs/msmnile_au/msmnile_au.mk
@@ -555,7 +555,7 @@ PRODUCT_PACKAGES_DEBUG += \
     AudioSettings
 
 # for HIDL related audiocontrol packages
-ifeq ( ,$(filter 12 13 T,$(PLATFORM_VERSION)))
+ifeq ( ,$(filter 12 13 T U UpsideDownCake 14,$(PLATFORM_VERSION)))
 PRODUCT_PACKAGES += \
     android.hardware.automotive.audiocontrol@2.0-service \
     android.hardware.automotive.audiocontrol@2.0
diff --git a/hal/audio_extn/audio_extn.c b/hal/audio_extn/audio_extn.c
index 57813920..b9832bbf 100644
--- a/hal/audio_extn/audio_extn.c
+++ b/hal/audio_extn/audio_extn.c
@@ -38,7 +38,7 @@
 /*
 * Changes from Qualcomm Innovation Center are provided under the following license:
 *
-* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+* Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted (subject to the limitations in the
@@ -6590,7 +6590,7 @@ void audio_extn_synth_set_parameters(struct audio_device *adev,
 #endif
 
 static void* power_policy_lib_handle;
-typedef int (*launch_power_policy_t) ();
+typedef int (*launch_power_policy_t) (power_policy_init_config_t);
 static launch_power_policy_t launch_power_policy;
 
 static void* power_policy_thread_func(void* arg __unused) {
diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index ab9536cc..df3d21ad 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -10349,7 +10349,7 @@ static void adev_close_input_stream(struct audio_hw_device *dev,
     }
 
     if (audio_extn_compr_cap_enabled() &&
-            audio_extn_compr_cap_format_supported(in->config.format))
+            audio_extn_compr_cap_format_supported(pcm_format_to_audio_format((in->config).format)))
         audio_extn_compr_cap_deinit();
 
     if (audio_extn_cin_attached_usecase(in))
diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index c92dfe47..ce2eedd3 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -351,7 +351,7 @@ struct platform_data {
     /* Audio calibration related functions */
     void                       *acdb_handle;
     int                        voice_feature_set;
-    acdb_init_t                acdb_init;
+    acdb_init_v2_t             acdb_init;
     acdb_init_v3_t             acdb_init_v3;
     acdb_init_v4_t             acdb_init_v4;
     acdb_deallocate_t          acdb_deallocate;
@@ -3836,10 +3836,10 @@ void *platform_init(struct audio_device *adev)
             ALOGE("%s: dlsym error %s for acdb_loader_init_v3", __func__, dlerror());
         }
 
-        my_data->acdb_init = (acdb_init_t)dlsym(my_data->acdb_handle,
-                                                     "acdb_loader_init_v3");
+        my_data->acdb_init = (acdb_init_v2_t)dlsym(my_data->acdb_handle,
+                                                     "acdb_loader_init_v2");
         if (my_data->acdb_init == NULL) {
-            ALOGE("%s: dlsym error %s for acdb_loader_init_v3", __func__, dlerror());
+            ALOGE("%s: dlsym error %s for acdb_loader_init_v2", __func__, dlerror());
             goto acdb_init_fail;
         }
 
diff --git a/hal/voice.c b/hal/voice.c
index e2218e67..355dea7a 100644
--- a/hal/voice.c
+++ b/hal/voice.c
@@ -502,7 +502,7 @@ int voice_check_and_set_incall_rec_usecase(struct audio_device *adev,
         switch (in->source) {
         case AUDIO_SOURCE_VOICE_UPLINK:
             if (audio_extn_compr_cap_enabled() &&
-                audio_extn_compr_cap_format_supported(in->config.format)) {
+                audio_extn_compr_cap_format_supported(pcm_format_to_audio_format(in->config.format))) {
                 in->usecase = USECASE_INCALL_REC_UPLINK_COMPRESS;
             } else
                 in->usecase = USECASE_INCALL_REC_UPLINK;
@@ -510,7 +510,7 @@ int voice_check_and_set_incall_rec_usecase(struct audio_device *adev,
             break;
         case AUDIO_SOURCE_VOICE_DOWNLINK:
             if (audio_extn_compr_cap_enabled() &&
-                audio_extn_compr_cap_format_supported(in->config.format)) {
+                audio_extn_compr_cap_format_supported(pcm_format_to_audio_format(in->config.format))) {
                 in->usecase = USECASE_INCALL_REC_DOWNLINK_COMPRESS;
             } else
                 in->usecase = USECASE_INCALL_REC_DOWNLINK;
@@ -518,7 +518,7 @@ int voice_check_and_set_incall_rec_usecase(struct audio_device *adev,
             break;
         case AUDIO_SOURCE_VOICE_CALL:
             if (audio_extn_compr_cap_enabled() &&
-                audio_extn_compr_cap_format_supported(in->config.format)) {
+                audio_extn_compr_cap_format_supported(pcm_format_to_audio_format(in->config.format))) {
                 in->usecase = USECASE_INCALL_REC_UPLINK_AND_DOWNLINK_COMPRESS;
             } else
                 in->usecase = USECASE_INCALL_REC_UPLINK_AND_DOWNLINK;