diff --git a/bluetooth/le_audio_codec_capabilities.xml b/bluetooth/le_audio_codec_capabilities.xml
index b4d98581..d0adfb2a 100644
--- a/bluetooth/le_audio_codec_capabilities.xml
+++ b/bluetooth/le_audio_codec_capabilities.xml
@@ -52,7 +52,6 @@
     <scenario encode="TwoChanStereo_32_2" decode="OneChanMono_32_2"/>
     <scenario encode="OneChanMono_32_2" decode="OneChanMono_32_2"/>
     <!-- broadcast -->
-    <scenario encode="invalid" decode="invalid" broadcast="BcastStereo_48_4"/>
     <scenario encode="invalid" decode="invalid" broadcast="BcastStereo_48_2"/>
     <scenario encode="invalid" decode="invalid" broadcast="BcastStereo_24_2"/>
     <scenario encode="invalid" decode="invalid" broadcast="BcastStereo_16_2"/>
@@ -76,7 +75,6 @@
     <configuration name="OneChanMono_48_4" codecConfiguration="LC3_48k_4" strategyConfiguration="MONO_ONE_CIS_PER_DEVICE"/>
     <configuration name="TwoChanStereo_48_4" codecConfiguration="LC3_48k_4" strategyConfiguration="STEREO_TWO_CISES_PER_DEVICE"/>
     <configuration name="OneChanStereo_48_4" codecConfiguration="LC3_48k_4" strategyConfiguration="STEREO_ONE_CIS_PER_DEVICE"/>
-    <configuration name="BcastStereo_48_4" codecConfiguration="LC3_48k_4" strategyConfiguration="BROADCAST_STEREO"/>
     <configuration name="BcastStereo_48_2" codecConfiguration="LC3_48k_2" strategyConfiguration="BROADCAST_STEREO"/>
     <configuration name="BcastStereo_24_2" codecConfiguration="LC3_24k_2" strategyConfiguration="BROADCAST_STEREO"/>
     <configuration name="BcastStereo_16_2" codecConfiguration="LC3_16k_2" strategyConfiguration="BROADCAST_STEREO"/>
diff --git a/device-caiman.mk b/device-caiman.mk
index 1aaf2191..5028ccb7 100644
--- a/device-caiman.mk
+++ b/device-caiman.mk
@@ -384,3 +384,7 @@ PRODUCT_PACKAGES += \
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
 $(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
 endif
+
+# Enable Bluetooth AutoOn feature
+PRODUCT_PRODUCT_PROPERTIES += \
+    bluetooth.server.automatic_turn_on=true
diff --git a/device-komodo.mk b/device-komodo.mk
index 94ee6311..32662625 100644
--- a/device-komodo.mk
+++ b/device-komodo.mk
@@ -380,3 +380,7 @@ PRODUCT_PACKAGES += \
 PRODUCT_PRODUCT_PROPERTIES += \
           ro.com.google.ime.kb_pad_port_b=9.6 \
           ro.com.google.ime.height_ratio=1.13
+
+# Enable Bluetooth AutoOn feature
+PRODUCT_PRODUCT_PROPERTIES += \
+    bluetooth.server.automatic_turn_on=true
diff --git a/device-ripcurrent24.mk b/device-ripcurrent24.mk
index f6970e68..37d67c53 100644
--- a/device-ripcurrent24.mk
+++ b/device-ripcurrent24.mk
@@ -241,14 +241,3 @@ PRODUCT_VENDOR_PROPERTIES += \
 # PKVM Memory Reclaim
 PRODUCT_VENDOR_PROPERTIES += \
     hypervisor.memory_reclaim.supported=1
-
-# Indicate that the bootloader supports the MTE developer option switch
-# (MISC_MEMTAG_MODE_MEMTAG_ONCE), with the exception of _fullmte products that
-# force enable MTE.
-ifeq (,$(filter %_fullmte,$(TARGET_PRODUCT)))
-PRODUCT_PRODUCT_PROPERTIES += ro.arm64.memtag.bootctl_supported=1
-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
-endif
diff --git a/device-ripcurrentpro.mk b/device-ripcurrentpro.mk
index c0332e19..ee3becc2 100644
--- a/device-ripcurrentpro.mk
+++ b/device-ripcurrentpro.mk
@@ -242,17 +242,6 @@ PRODUCT_VENDOR_PROPERTIES += \
 PRODUCT_VENDOR_PROPERTIES += \
     hypervisor.memory_reclaim.supported=1
 
-# Indicate that the bootloader supports the MTE developer option switch
-# (MISC_MEMTAG_MODE_MEMTAG_ONCE), with the exception of _fullmte products that
-# force enable MTE.
-ifeq (,$(filter %_fullmte,$(TARGET_PRODUCT)))
-PRODUCT_PRODUCT_PROPERTIES += ro.arm64.memtag.bootctl_supported=1
-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
-endif
-
 # Thread HAL
 PRODUCT_PACKAGES += \
    com.google.caimito.hardware.threadnetwork
diff --git a/device-tokay.mk b/device-tokay.mk
index 704b807c..cbccdd76 100644
--- a/device-tokay.mk
+++ b/device-tokay.mk
@@ -350,3 +350,7 @@ PRODUCT_PACKAGES += \
 PRODUCT_PRODUCT_PROPERTIES += \
           ro.com.google.ime.kb_pad_port_b=8 \
           ro.com.google.ime.height_ratio=1.09
+
+# Enable Bluetooth AutoOn feature
+PRODUCT_PRODUCT_PROPERTIES += \
+    bluetooth.server.automatic_turn_on=true