diff --git a/audio/husky/aidl_config/audio_platform_configuration.xml b/audio/husky/aidl_config/audio_platform_configuration.xml
index 1e775b2..c7db1ee 100644
--- a/audio/husky/aidl_config/audio_platform_configuration.xml
+++ b/audio/husky/aidl_config/audio_platform_configuration.xml
@@ -23,7 +23,7 @@
     <feature name="PlaybackThermalThrottle">
       <argument name="PollWaitMs" value="20000" />
       <argument name="ThermistorName" value="VIRTUAL-SKIN-SPEAKER" />
-      <argument name="ThermistorType" value="SKIN" />
+      <argument name="ThermistorType" value="UNKNOWN" />
       <argument name="ThrottlingSeverity" value="MODERATE" />
     </feature>
     <feature name="RuntimeTuningDump" />
diff --git a/audio/husky/audio-tables.mk b/audio/husky/audio-tables.mk
index e1b429a..7cbcdf4 100644
--- a/audio/husky/audio-tables.mk
+++ b/audio/husky/audio-tables.mk
@@ -17,7 +17,7 @@
 AUDIO_TABLE_FOLDER := husky
 
 # Choose AIDL config by build flag.
-ifeq ($(RELEASE_PIXEL_AIDL_AUDIO_HAL),true)
+ifeq ($(USE_AUDIO_HAL_AIDL),true)
 PRODUCT_SOONG_NAMESPACES += device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config
 PRODUCT_PACKAGES += audio_aidl_configs
 
diff --git a/audio/shiba/aidl_config/audio_platform_configuration.xml b/audio/shiba/aidl_config/audio_platform_configuration.xml
index 1e775b2..c7db1ee 100644
--- a/audio/shiba/aidl_config/audio_platform_configuration.xml
+++ b/audio/shiba/aidl_config/audio_platform_configuration.xml
@@ -23,7 +23,7 @@
     <feature name="PlaybackThermalThrottle">
       <argument name="PollWaitMs" value="20000" />
       <argument name="ThermistorName" value="VIRTUAL-SKIN-SPEAKER" />
-      <argument name="ThermistorType" value="SKIN" />
+      <argument name="ThermistorType" value="UNKNOWN" />
       <argument name="ThrottlingSeverity" value="MODERATE" />
     </feature>
     <feature name="RuntimeTuningDump" />
diff --git a/audio/shiba/audio-tables.mk b/audio/shiba/audio-tables.mk
index b5e8045..a21cd56 100644
--- a/audio/shiba/audio-tables.mk
+++ b/audio/shiba/audio-tables.mk
@@ -17,7 +17,7 @@
 AUDIO_TABLE_FOLDER := shiba
 
 # Choose AIDL config by build flag.
-ifeq ($(RELEASE_PIXEL_AIDL_AUDIO_HAL),true)
+ifeq ($(USE_AUDIO_HAL_AIDL),true)
 PRODUCT_SOONG_NAMESPACES += device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config
 PRODUCT_PACKAGES += audio_aidl_configs
 
diff --git a/device-husky.mk b/device-husky.mk
index dd55184..4c440e0 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -48,9 +48,9 @@ PRODUCT_COPY_FILES += \
 
 CAMERA_PRODUCT ?= husky
 
-include device/google/shusky/audio/husky/audio-tables.mk
 include device/google/shusky/camera/camera.mk
 include device/google/zuma/device-shipping-common.mk
+include device/google/shusky/audio/husky/audio-tables.mk
 include hardware/google/pixel/vibrator/cs40l26/device.mk
 include device/google/gs-common/bcmbt/bluetooth.mk
 include device/google/gs-common/touch/stm/stm20.mk
diff --git a/device-shiba.mk b/device-shiba.mk
index ae2326e..565ea6c 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -32,9 +32,9 @@ $(call inherit-product-if-exists, vendor/google_devices/shusky/proprietary/Wallp
 DEVICE_PACKAGE_OVERLAYS += device/google/shusky/shiba/overlay
 CAMERA_PRODUCT ?= shiba
 
-include device/google/shusky/audio/shiba/audio-tables.mk
 include device/google/shusky/camera/camera.mk
 include device/google/zuma/device-shipping-common.mk
+include device/google/shusky/audio/shiba/audio-tables.mk
 include hardware/google/pixel/vibrator/cs40l26/device.mk
 include device/google/gs-common/bcmbt/bluetooth.mk
 include device/google/gs-common/touch/gti/gti.mk