diff --git a/configs/lahaina/lahaina.mk b/configs/lahaina/lahaina.mk
index 669f73c..c1c8685 100644
--- a/configs/lahaina/lahaina.mk
+++ b/configs/lahaina/lahaina.mk
@@ -103,6 +103,9 @@
 PRODUCT_PACKAGES += $(AUDIO_WRAPPER)
 PRODUCT_PACKAGES += $(AUDIO_HAL_TEST_APPS)
 PRODUCT_PACKAGES += ftm_test_config_lahaina-qrd-snd-card
+PRODUCT_PACKAGES += ftm_test_config_lahaina-shimaidp-snd-card
+PRODUCT_PACKAGES += ftm_test_config_lahaina-shimaidps-snd-card
+PRODUCT_PACKAGES += ftm_test_config_lahaina-shimaqrd-snd-card
 PRODUCT_PACKAGES += audioadsprpcd
 PRODUCT_PACKAGES += vendor.qti.audio-adsprpc-service.rc
 
diff --git a/hal/msm8974/hw_info.c b/hal/msm8974/hw_info.c
index 4ecd25f..bee414b 100644
--- a/hal/msm8974/hw_info.c
+++ b/hal/msm8974/hw_info.c
@@ -607,6 +607,7 @@
     } else if (!strncmp(snd_card_name, "lahaina-shimaqrd-snd-card",
                  sizeof("lahaina-shimaqrd-snd-card"))) {
         strlcpy(hw_info->name, "shima", sizeof(hw_info->name));
+        hw_info->is_stereo_spkr = false;
     } else {
         ALOGW("%s: Not a lahaina device", __func__);
     }
diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 5fda1f8..c39d258 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -3433,8 +3433,7 @@
     } else if (my_data->is_internal_codec) {
         platform_info_init(get_xml_file_path(PLATFORM_INFO_XML_PATH_INTCODEC_NAME),
             my_data, PLATFORM);
-    }
-    else {
+    } else {
         // Try to load pixel or default
         audio_extn_utils_get_platform_info(snd_card_name, platform_info_file);
         platform_info_init(platform_info_file, my_data, PLATFORM);