diff --git a/device-husky.mk b/device-husky.mk
index 0421096..4353be3 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -179,8 +179,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
 # Bluetooth LE Audio enable hardware offloading
 PRODUCT_PRODUCT_PROPERTIES += \
 	ro.bluetooth.leaudio_offload.supported=true \
-	persist.bluetooth.leaudio_offload.disabled=false \
-	ro.bluetooth.leaudio_broadcast_switcher.supported=true
+	persist.bluetooth.leaudio_offload.disabled=false
 
 # Bluetooth LE Auido offload capabilities setting
 PRODUCT_COPY_FILES += \
diff --git a/device-ripcurrent.mk b/device-ripcurrent.mk
index 9ae30a5..87ce735 100644
--- a/device-ripcurrent.mk
+++ b/device-ripcurrent.mk
@@ -155,8 +155,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
 # Bluetooth LE Audio enable hardware offloading
 PRODUCT_PRODUCT_PROPERTIES += \
 	ro.bluetooth.leaudio_offload.supported=true \
-	persist.bluetooth.leaudio_offload.disabled=false \
-	ro.bluetooth.leaudio_broadcast_switcher.supported=true
+	persist.bluetooth.leaudio_offload.disabled=false
 
 # Bluetooth LE Auido offload capabilities setting
 PRODUCT_COPY_FILES += \
diff --git a/device-shiba.mk b/device-shiba.mk
index 1db8078..9933229 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -168,8 +168,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
 # Bluetooth LE Audio enable hardware offloading
 PRODUCT_PRODUCT_PROPERTIES += \
 	ro.bluetooth.leaudio_offload.supported=true \
-	persist.bluetooth.leaudio_offload.disabled=false \
-	ro.bluetooth.leaudio_broadcast_switcher.supported=true
+	persist.bluetooth.leaudio_offload.disabled=false
 
 # Bluetooth LE Auido offload capabilities setting
 PRODUCT_COPY_FILES += \
diff --git a/wifi/BoardConfig-wifi.mk b/wifi/BoardConfig-wifi.mk
index fdc7409..4710298 100644
--- a/wifi/BoardConfig-wifi.mk
+++ b/wifi/BoardConfig-wifi.mk
@@ -36,3 +36,5 @@ PRODUCT_COPY_FILES += \
     device/google/shusky/wifi/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \
     device/google/shusky/wifi/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf
 
+# Add WIFI_FEATURE_IMU_DETECTION to soong_config
+$(call soong_config_set,wifi,feature_imu_detection,$(WIFI_FEATURE_IMU_DETECTION))