diff --git a/audio/husky/aidl_config/mixer_paths_aidl.xml b/audio/husky/aidl_config/mixer_paths_aidl.xml
index 790a3ff..06e0b54 100644
--- a/audio/husky/aidl_config/mixer_paths_aidl.xml
+++ b/audio/husky/aidl_config/mixer_paths_aidl.xml
@@ -425,6 +425,10 @@
     <path name="primary-playback-0 -> usb" />
   </path>
 
+  <path name="primary-playback-0 -> hdmi-device">
+    <path name="primary-playback-0 -> usb" />
+  </path>
+
   <path name="raw-playback -> speaker">
     <ctl name="TDM_0_RX Mixer RAW" value="1" />
   </path>
@@ -493,6 +497,10 @@
     <path name="raw-playback-0 -> usb" />
   </path>
 
+  <path name="raw-playback-0 -> hdmi-device">
+    <path name="raw-playback-0 -> usb" />
+  </path>
+
   <path name="deep-buffer-playback -> speaker">
     <ctl name="TDM_0_RX Mixer EP6" value="1" />
   </path>
@@ -561,6 +569,10 @@
     <path name="deep-buffer-playback-0 -> usb" />
   </path>
 
+  <path name="deep-buffer-playback-0 -> hdmi-device">
+    <path name="deep-buffer-playback-0 -> usb" />
+  </path>
+
   <path name="compress-offload-playback">
     <ctl name="LVM Enable" value="1" />
   </path>
@@ -634,6 +646,10 @@
     <path name="compress-offload-playback-0 -> usb" />
   </path>
 
+  <path name="compress-offload-playback-0 -> hdmi-device">
+    <path name="compress-offload-playback-0 -> usb" />
+  </path>
+
   <path name="mmap-playback -> speaker">
     <ctl name="TDM_0_RX Mixer EP1" value="1" />
   </path>
@@ -702,6 +718,10 @@
     <path name="mmap-playback-0 -> usb" />
   </path>
 
+  <path name="mmap-playback-0 -> hdmi-device">
+    <path name="mmap-playback-0 -> usb" />
+  </path>
+
   <path name="hifi-playback-0 -> usb">
     <ctl name="USB_RX Mixer HIFI" value="1" />
   </path>
@@ -782,6 +802,10 @@
     <path name="voip-playback-0 -> usb" />
   </path>
 
+  <path name="voip-playback-0 -> hdmi-device">
+    <path name="voip-playback-0 -> usb" />
+  </path>
+
   <path name="immersive-playback -> speaker">
     <ctl name="TDM_0_RX Mixer IMSV" value="1" />
   </path>
@@ -949,6 +973,10 @@
     <path name="haptic-playback-0 -> usb" />
   </path>
 
+  <path name="haptic-playback-0 -> hdmi-device">
+    <path name="haptic-playback-0 -> usb" />
+  </path>
+
   <!-- audio capture dynamic route -->
   <path name="microphones -> primary-capture-0">
     <ctl name="EP1 TX Mixer INTERNAL_MIC_TX" value="1" />
diff --git a/audio/shiba/aidl_config/mixer_paths_aidl.xml b/audio/shiba/aidl_config/mixer_paths_aidl.xml
index 790a3ff..06e0b54 100644
--- a/audio/shiba/aidl_config/mixer_paths_aidl.xml
+++ b/audio/shiba/aidl_config/mixer_paths_aidl.xml
@@ -425,6 +425,10 @@
     <path name="primary-playback-0 -> usb" />
   </path>
 
+  <path name="primary-playback-0 -> hdmi-device">
+    <path name="primary-playback-0 -> usb" />
+  </path>
+
   <path name="raw-playback -> speaker">
     <ctl name="TDM_0_RX Mixer RAW" value="1" />
   </path>
@@ -493,6 +497,10 @@
     <path name="raw-playback-0 -> usb" />
   </path>
 
+  <path name="raw-playback-0 -> hdmi-device">
+    <path name="raw-playback-0 -> usb" />
+  </path>
+
   <path name="deep-buffer-playback -> speaker">
     <ctl name="TDM_0_RX Mixer EP6" value="1" />
   </path>
@@ -561,6 +569,10 @@
     <path name="deep-buffer-playback-0 -> usb" />
   </path>
 
+  <path name="deep-buffer-playback-0 -> hdmi-device">
+    <path name="deep-buffer-playback-0 -> usb" />
+  </path>
+
   <path name="compress-offload-playback">
     <ctl name="LVM Enable" value="1" />
   </path>
@@ -634,6 +646,10 @@
     <path name="compress-offload-playback-0 -> usb" />
   </path>
 
+  <path name="compress-offload-playback-0 -> hdmi-device">
+    <path name="compress-offload-playback-0 -> usb" />
+  </path>
+
   <path name="mmap-playback -> speaker">
     <ctl name="TDM_0_RX Mixer EP1" value="1" />
   </path>
@@ -702,6 +718,10 @@
     <path name="mmap-playback-0 -> usb" />
   </path>
 
+  <path name="mmap-playback-0 -> hdmi-device">
+    <path name="mmap-playback-0 -> usb" />
+  </path>
+
   <path name="hifi-playback-0 -> usb">
     <ctl name="USB_RX Mixer HIFI" value="1" />
   </path>
@@ -782,6 +802,10 @@
     <path name="voip-playback-0 -> usb" />
   </path>
 
+  <path name="voip-playback-0 -> hdmi-device">
+    <path name="voip-playback-0 -> usb" />
+  </path>
+
   <path name="immersive-playback -> speaker">
     <ctl name="TDM_0_RX Mixer IMSV" value="1" />
   </path>
@@ -949,6 +973,10 @@
     <path name="haptic-playback-0 -> usb" />
   </path>
 
+  <path name="haptic-playback-0 -> hdmi-device">
+    <path name="haptic-playback-0 -> usb" />
+  </path>
+
   <!-- audio capture dynamic route -->
   <path name="microphones -> primary-capture-0">
     <ctl name="EP1 TX Mixer INTERNAL_MIC_TX" value="1" />
diff --git a/device-husky.mk b/device-husky.mk
index cb60da0..9496a9c 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -20,6 +20,15 @@ $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
 TARGET_KERNEL_DIR ?= device/google/shusky-kernel
 TARGET_BOARD_KERNEL_HEADERS ?= device/google/shusky-kernel/kernel-headers
 
+ifdef RELEASE_GOOGLE_HUSKY_KERNEL_VERSION
+TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_HUSKY_KERNEL_VERSION)
+endif
+
+ifdef RELEASE_GOOGLE_HUSKY_KERNEL_DIR
+TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_HUSKY_KERNEL_DIR)
+TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_HUSKY_KERNEL_DIR)/kernel-headers
+endif
+
 LOCAL_PATH := device/google/shusky
 
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
@@ -48,6 +57,10 @@ PRODUCT_COPY_FILES += \
 
 CAMERA_PRODUCT ?= husky
 
+ifeq ($(RELEASE_PIXEL_AIDL_AUDIO_HAL_ZUMA),true)
+USE_AUDIO_HAL_AIDL := true
+endif
+
 include device/google/shusky/camera/camera.mk
 include device/google/shusky/audio/husky/audio-tables.mk
 include device/google/zuma/device-shipping-common.mk
@@ -193,6 +206,12 @@ PRODUCT_PRODUCT_PROPERTIES += \
 	bluetooth.profile.ccp.server.enabled=true \
 	bluetooth.profile.vcp.controller.enabled=true
 
+ifeq ($(RELEASE_PIXEL_BROADCAST_ENABLED), true)
+PRODUCT_PRODUCT_PROPERTIES += \
+	bluetooth.profile.bap.broadcast.assist.enabled=true \
+	bluetooth.profile.bap.broadcast.source.enabled=true
+endif
+
 # Bluetooth LE Audio enable hardware offloading
 PRODUCT_PRODUCT_PROPERTIES += \
 	ro.bluetooth.leaudio_offload.supported=true \
diff --git a/device-ripcurrent.mk b/device-ripcurrent.mk
index 0d14aad..8f13185 100644
--- a/device-ripcurrent.mk
+++ b/device-ripcurrent.mk
@@ -20,6 +20,15 @@ $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
 TARGET_KERNEL_DIR ?= device/google/shusky-kernel
 TARGET_BOARD_KERNEL_HEADERS ?= device/google/shusky-kernel/kernel-headers
 
+ifdef RELEASE_GOOGLE_RIPCURRENT_KERNEL_VERSION
+TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_RIPCURRENT_KERNEL_VERSION)
+endif
+
+ifdef RELEASE_GOOGLE_RIPCURRENT_KERNEL_DIR
+TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_RIPCURRENT_KERNEL_DIR)
+TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_RIPCURRENT_KERNEL_DIR)/kernel-headers
+endif
+
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
     USE_UWBFIELDTESTQM := true
 endif
@@ -158,6 +167,12 @@ PRODUCT_PRODUCT_PROPERTIES += \
 	bluetooth.profile.ccp.server.enabled=true \
 	bluetooth.profile.vcp.controller.enabled=true
 
+ifeq ($(RELEASE_PIXEL_BROADCAST_ENABLED), true)
+PRODUCT_PRODUCT_PROPERTIES += \
+	bluetooth.profile.bap.broadcast.assist.enabled=true \
+	bluetooth.profile.bap.broadcast.source.enabled=true
+endif
+
 # Bluetooth LE Audio enable hardware offloading
 PRODUCT_PRODUCT_PROPERTIES += \
 	ro.bluetooth.leaudio_offload.supported=true \
diff --git a/device-shiba.mk b/device-shiba.mk
index 4156044..da84aaa 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -20,6 +20,15 @@ $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
 TARGET_KERNEL_DIR ?= device/google/shusky-kernel
 TARGET_BOARD_KERNEL_HEADERS ?= device/google/shusky-kernel/kernel-headers
 
+ifdef RELEASE_GOOGLE_SHIBA_KERNEL_VERSION
+TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_SHIBA_KERNEL_VERSION)
+endif
+
+ifdef RELEASE_GOOGLE_SHIBA_KERNEL_DIR
+TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_SHIBA_KERNEL_DIR)
+TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_SHIBA_KERNEL_DIR)/kernel-headers
+endif
+
 LOCAL_PATH := device/google/shusky
 
 $(call inherit-product-if-exists, vendor/google_devices/shusky/prebuilts/device-vendor-shiba.mk)
@@ -32,6 +41,10 @@ $(call inherit-product-if-exists, vendor/google_devices/shusky/proprietary/Wallp
 DEVICE_PACKAGE_OVERLAYS += device/google/shusky/shiba/overlay
 CAMERA_PRODUCT ?= shiba
 
+ifeq ($(RELEASE_PIXEL_AIDL_AUDIO_HAL_ZUMA),true)
+USE_AUDIO_HAL_AIDL := true
+endif
+
 include device/google/shusky/camera/camera.mk
 include device/google/shusky/audio/shiba/audio-tables.mk
 include device/google/zuma/device-shipping-common.mk
@@ -181,6 +194,12 @@ PRODUCT_PRODUCT_PROPERTIES += \
 	bluetooth.profile.ccp.server.enabled=true \
 	bluetooth.profile.vcp.controller.enabled=true
 
+ifeq ($(RELEASE_PIXEL_BROADCAST_ENABLED), true)
+PRODUCT_PRODUCT_PROPERTIES += \
+	bluetooth.profile.bap.broadcast.assist.enabled=true \
+	bluetooth.profile.bap.broadcast.source.enabled=true
+endif
+
 # Bluetooth LE Audio enable hardware offloading
 PRODUCT_PRODUCT_PROPERTIES += \
 	ro.bluetooth.leaudio_offload.supported=true \
diff --git a/self-extractors_husky/extract-lists.txt b/self-extractors_husky/extract-lists.txt
index e8333da..9f3c26f 100644
--- a/self-extractors_husky/extract-lists.txt
+++ b/self-extractors_husky/extract-lists.txt
@@ -5,13 +5,11 @@
             IMAGES/vendor_dlkm.img \
             RADIO/bootloader.img \
             RADIO/radio.img \
-            system_ext/etc/permissions/com.android.qns.xml \
             system_ext/etc/permissions/com.shannon.imsservice.xml \
             system_ext/etc/permissions/com.shannon.rcsservice.xml \
             system_ext/lib64/libmediaadaptor.so \
             system_ext/priv-app/ShannonRcs/ShannonRcs.apk \
             system_ext/priv-app/ShannonIms/ShannonIms.apk \
-            system_ext/priv-app/PixelQualifiedNetworksService/PixelQualifiedNetworksService.apk \
             "
     ;;
 
diff --git a/self-extractors_husky/google_devices/staging/Android.mk b/self-extractors_husky/google_devices/staging/Android.mk
index a3a6f13..7aa8601 100644
--- a/self-extractors_husky/google_devices/staging/Android.mk
+++ b/self-extractors_husky/google_devices/staging/Android.mk
@@ -22,22 +22,6 @@ ifneq ($(filter husky,$(TARGET_DEVICE)),)
 endif
 
 ifneq ($(filter husky,$(TARGET_DEVICE)),)
-include $(CLEAR_VARS)
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-LOCAL_MODULE := PixelQualifiedNetworksService
-LOCAL_MODULE_TAGS := optional
-LOCAL_BUILT_MODULE_STEM := package.apk
-LOCAL_SYSTEM_EXT_MODULE := true
-LOCAL_PRIVILEGED_MODULE := true
-LOCAL_MODULE_OWNER := google
-LOCAL_MODULE_CLASS := APPS
-LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
-LOCAL_CERTIFICATE := platform
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE
-include $(BUILD_PREBUILT)
-
 include $(CLEAR_VARS)
 LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
 LOCAL_MODULE := ShannonIms
diff --git a/self-extractors_husky/google_devices/staging/device-partial.mk b/self-extractors_husky/google_devices/staging/device-partial.mk
index 9251f56..a5fd796 100644
--- a/self-extractors_husky/google_devices/staging/device-partial.mk
+++ b/self-extractors_husky/google_devices/staging/device-partial.mk
@@ -17,7 +17,6 @@ PRODUCT_SOONG_NAMESPACES += \
 
 # AOSP packages required by the blobs
 PRODUCT_PACKAGES := \
-    PixelQualifiedNetworksService \
     ShannonIms \
     ShannonRcs \
 
@@ -26,7 +25,6 @@ PRODUCT_PACKAGES += \
 
 #  blob(s) necessary for husky hardware
 PRODUCT_COPY_FILES := \
-    vendor/google_devices/husky/proprietary/com.android.qns.xml:system_ext/etc/permissions/com.android.qns.xml:google \
     vendor/google_devices/husky/proprietary/com.shannon.imsservice.xml:system_ext/etc/permissions/com.shannon.imsservice.xml:samsung \
     vendor/google_devices/husky/proprietary/com.shannon.rcsservice.xml:system_ext/etc/permissions/com.shannon.rcsservice.xml:samsung \
 
diff --git a/self-extractors_shiba/extract-lists.txt b/self-extractors_shiba/extract-lists.txt
index e8333da..9f3c26f 100644
--- a/self-extractors_shiba/extract-lists.txt
+++ b/self-extractors_shiba/extract-lists.txt
@@ -5,13 +5,11 @@
             IMAGES/vendor_dlkm.img \
             RADIO/bootloader.img \
             RADIO/radio.img \
-            system_ext/etc/permissions/com.android.qns.xml \
             system_ext/etc/permissions/com.shannon.imsservice.xml \
             system_ext/etc/permissions/com.shannon.rcsservice.xml \
             system_ext/lib64/libmediaadaptor.so \
             system_ext/priv-app/ShannonRcs/ShannonRcs.apk \
             system_ext/priv-app/ShannonIms/ShannonIms.apk \
-            system_ext/priv-app/PixelQualifiedNetworksService/PixelQualifiedNetworksService.apk \
             "
     ;;
 
diff --git a/self-extractors_shiba/google_devices/staging/Android.mk b/self-extractors_shiba/google_devices/staging/Android.mk
index 124f68a..60eca2a 100644
--- a/self-extractors_shiba/google_devices/staging/Android.mk
+++ b/self-extractors_shiba/google_devices/staging/Android.mk
@@ -22,22 +22,6 @@ ifneq ($(filter shiba,$(TARGET_DEVICE)),)
 endif
 
 ifneq ($(filter shiba,$(TARGET_DEVICE)),)
-include $(CLEAR_VARS)
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-LOCAL_MODULE := PixelQualifiedNetworksService
-LOCAL_MODULE_TAGS := optional
-LOCAL_BUILT_MODULE_STEM := package.apk
-LOCAL_SYSTEM_EXT_MODULE := true
-LOCAL_PRIVILEGED_MODULE := true
-LOCAL_MODULE_OWNER := google
-LOCAL_MODULE_CLASS := APPS
-LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
-LOCAL_CERTIFICATE := platform
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE
-include $(BUILD_PREBUILT)
-
 include $(CLEAR_VARS)
 LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
 LOCAL_MODULE := ShannonIms
diff --git a/self-extractors_shiba/google_devices/staging/device-partial.mk b/self-extractors_shiba/google_devices/staging/device-partial.mk
index 99e217f..9c64f07 100644
--- a/self-extractors_shiba/google_devices/staging/device-partial.mk
+++ b/self-extractors_shiba/google_devices/staging/device-partial.mk
@@ -17,7 +17,6 @@ PRODUCT_SOONG_NAMESPACES += \
 
 # AOSP packages required by the blobs
 PRODUCT_PACKAGES := \
-    PixelQualifiedNetworksService \
     ShannonIms \
     ShannonRcs \
 
@@ -26,7 +25,6 @@ PRODUCT_PACKAGES += \
 
 #  blob(s) necessary for shiba hardware
 PRODUCT_COPY_FILES := \
-    vendor/google_devices/shiba/proprietary/com.android.qns.xml:system_ext/etc/permissions/com.android.qns.xml:google \
     vendor/google_devices/shiba/proprietary/com.shannon.imsservice.xml:system_ext/etc/permissions/com.shannon.imsservice.xml:samsung \
     vendor/google_devices/shiba/proprietary/com.shannon.rcsservice.xml:system_ext/etc/permissions/com.shannon.rcsservice.xml:samsung \