diff --git a/device-common.mk b/device-common.mk
index f197763e..1998d96d 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -63,6 +63,4 @@ PRODUCT_PRODUCT_PROPERTIES += persist.arm64.memtag.app.com.android.se=off
 PRODUCT_PRODUCT_PROPERTIES += persist.arm64.memtag.app.com.google.android.bluetooth=off
 PRODUCT_PRODUCT_PROPERTIES += persist.arm64.memtag.app.com.android.nfc=off
 PRODUCT_PRODUCT_PROPERTIES += persist.arm64.memtag.system_server=off
-else
-PRODUCT_PRODUCT_PROPERTIES += persist.arm64.memtag.app.com.android.chrome=off
 endif
diff --git a/device.mk b/device.mk
index 9c36b331..4123cf21 100644
--- a/device.mk
+++ b/device.mk
@@ -1027,11 +1027,11 @@ PRODUCT_PACKAGES += \
 
 # Audio
 # Audio HAL Server & Default Implementations
-#ifeq ($(RELEASE_PIXEL_AIDL_AUDIO_HAL),true)
-#include device/google/gs-common/audio/aidl.mk
-#else
+ifeq ($(USE_AUDIO_HAL_AIDL),true)
+include device/google/gs-common/audio/aidl.mk
+else
 include device/google/gs-common/audio/hidl_zuma.mk
-#endif
+endif
 
 ## AoC soong
 PRODUCT_SOONG_NAMESPACES += \