diff --git a/audio/ripcurrent/config/audio_platform_configuration.xml b/audio/ripcurrent/config/audio_platform_configuration.xml
index 1aab4e6..2435e98 100644
--- a/audio/ripcurrent/config/audio_platform_configuration.xml
+++ b/audio/ripcurrent/config/audio_platform_configuration.xml
@@ -295,6 +295,7 @@
     <device_handle>
         <handler libname="audio_bt_aoc.so"/>
         <handler libname="audio_usb_aoc.so" argu="MaxSamplingRate=192000,UnsupportedFormat=S24_LE,MaxCapPacketInterval=125,MaxCapSampleRate=192000,MaxCapBitWidth=32,MaxCapChannel=2,EnableHifi192kMultichannel=0"/>
+        <handler libname="audio_hdmi_aoc.so"/>
     </device_handle>
 
     <external_module>
diff --git a/audio/ripcurrent/config/audio_policy_configuration.xml b/audio/ripcurrent/config/audio_policy_configuration.xml
index c53bfe2..2620d7f 100644
--- a/audio/ripcurrent/config/audio_policy_configuration.xml
+++ b/audio/ripcurrent/config/audio_policy_configuration.xml
@@ -148,7 +148,7 @@
                 </devicePort>
                 <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
                 </devicePort>
-                <devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
+                <devicePort tagName="HDMI Out" type="AUDIO_DEVICE_OUT_HDMI" role="sink">
                 </devicePort>
                 <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
                 </devicePort>
@@ -227,6 +227,8 @@
                        sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/>
                 <route type="mix" sink="USB Headset Out"
                        sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/>
+                <route type="mix" sink="HDMI Out"
+                       sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/>
                 <route type="mix" sink="BT SCO"
                        sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO Headset"
diff --git a/audio/ripcurrent/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/ripcurrent/config/audio_policy_configuration_a2dp_offload_disabled.xml
index 6352aac..2fffbfa 100644
--- a/audio/ripcurrent/config/audio_policy_configuration_a2dp_offload_disabled.xml
+++ b/audio/ripcurrent/config/audio_policy_configuration_a2dp_offload_disabled.xml
@@ -148,7 +148,7 @@
                 </devicePort>
                 <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
                 </devicePort>
-                <devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
+                <devicePort tagName="HDMI Out" type="AUDIO_DEVICE_OUT_HDMI" role="sink">
                 </devicePort>
                 <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
                 </devicePort>
@@ -183,6 +183,8 @@
                        sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/>
                 <route type="mix" sink="USB Headset Out"
                        sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/>
+                <route type="mix" sink="HDMI Out"
+                       sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/>
                 <route type="mix" sink="BT SCO"
                        sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO Headset"
diff --git a/audio/ripcurrent/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/ripcurrent/config/audio_policy_configuration_bluetooth_legacy_hal.xml
index e80ded5..7b32451 100644
--- a/audio/ripcurrent/config/audio_policy_configuration_bluetooth_legacy_hal.xml
+++ b/audio/ripcurrent/config/audio_policy_configuration_bluetooth_legacy_hal.xml
@@ -144,7 +144,7 @@
                 </devicePort>
                 <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
                 </devicePort>
-                <devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
+                <devicePort tagName="HDMI Out" type="AUDIO_DEVICE_OUT_HDMI" role="sink">
                 </devicePort>
                 <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
                 </devicePort>
@@ -179,6 +179,8 @@
                        sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback"/>
                 <route type="mix" sink="USB Headset Out"
                        sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback"/>
+                <route type="mix" sink="HDMI Out"
+                       sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx"/>
                 <route type="mix" sink="BT SCO"
                        sources="primary output,deep buffer,haptic,voip_rx,raw,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO Headset"
diff --git a/audio/ripcurrent/config/audio_policy_configuration_le_offload_disabled.xml b/audio/ripcurrent/config/audio_policy_configuration_le_offload_disabled.xml
index 3fdeb3f..ce7f29d 100644
--- a/audio/ripcurrent/config/audio_policy_configuration_le_offload_disabled.xml
+++ b/audio/ripcurrent/config/audio_policy_configuration_le_offload_disabled.xml
@@ -148,7 +148,7 @@
                 </devicePort>
                 <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
                 </devicePort>
-                <devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
+                <devicePort tagName="HDMI Out" type="AUDIO_DEVICE_OUT_HDMI" role="sink">
                 </devicePort>
                 <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
                 </devicePort>
@@ -204,6 +204,8 @@
                        sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/>
                 <route type="mix" sink="USB Headset Out"
                        sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/>
+                <route type="mix" sink="HDMI Out"
+                       sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/>
                 <route type="mix" sink="BT SCO"
                        sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO Headset"
diff --git a/audio/ripcurrent/config/mixer_paths.xml b/audio/ripcurrent/config/mixer_paths.xml
index 6bbe394..743e247 100644
--- a/audio/ripcurrent/config/mixer_paths.xml
+++ b/audio/ripcurrent/config/mixer_paths.xml
@@ -700,6 +700,12 @@
         <ctl name="R Main AMP Enable Switch" value="1"/>
     </path>
 
+    <path name="hdmi">
+    </path>
+
+    <path name="hdmi-post">
+    </path>
+
     <path name="speaker-safe">
         <ctl name="R Main AMP Enable Switch" value="1"/>
     </path>
diff --git a/device-husky.mk b/device-husky.mk
index bab1542..f8786c7 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -124,6 +124,10 @@ PRODUCT_PACKAGES += \
 PRODUCT_PROPERTY_OVERRIDES += \
        ro.audio.spatializer_enabled=true
 
+# Audio CCA property
+PRODUCT_PROPERTY_OVERRIDES += \
+	persist.vendor.audio.cca.enabled=false
+
 # DCK properties based on target
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.gms.dck.eligible_wcc=3 \
@@ -239,6 +243,16 @@ PRODUCT_PACKAGES += \
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts
 
 # Location
+# SDK build system
+ifneq ($(BOARD_WITHOUT_RADIO),true)
+# Release stable version to factory image
+ifneq ($(filter factory_%,$(TARGET_PRODUCT)),)
+	include device/google/gs-common/gps/brcm/device.mk
+else
+	include device/google/gs-common/gps/brcm/device_v2.mk
+endif
+endif
+
 PRODUCT_COPY_FILES += \
        device/google/shusky/location/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer
 
diff --git a/device-ripcurrent.mk b/device-ripcurrent.mk
index 87ce735..77d5c9b 100644
--- a/device-ripcurrent.mk
+++ b/device-ripcurrent.mk
@@ -203,6 +203,16 @@ PRODUCT_PACKAGES += \
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts
 
 # Location
+# SDK build system
+ifneq ($(BOARD_WITHOUT_RADIO),true)
+# Release stable version to factory image
+ifneq ($(filter factory_%,$(TARGET_PRODUCT)),)
+	include device/google/gs-common/gps/brcm/device.mk
+else
+	include device/google/gs-common/gps/brcm/device_v2.mk
+endif
+endif
+
 PRODUCT_COPY_FILES += \
        device/google/shusky/location/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer
 
diff --git a/device-shiba.mk b/device-shiba.mk
index ceeef17..02dad18 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -115,6 +115,10 @@ PRODUCT_PACKAGES += \
 PRODUCT_PROPERTY_OVERRIDES += \
        ro.audio.spatializer_enabled=true
 
+# Audio CCA property
+PRODUCT_PROPERTY_OVERRIDES += \
+	persist.vendor.audio.cca.enabled=false
+
 # DCK properties based on target
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.gms.dck.eligible_wcc=2 \
@@ -229,6 +233,16 @@ PRODUCT_PACKAGES += \
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts
 
 # Location
+# SDK build system
+ifneq ($(BOARD_WITHOUT_RADIO),true)
+# Release stable version to factory image
+ifneq ($(filter factory_%,$(TARGET_PRODUCT)),)
+	include device/google/gs-common/gps/brcm/device.mk
+else
+	include device/google/gs-common/gps/brcm/device_v2.mk
+endif
+endif
+
 PRODUCT_COPY_FILES += \
        device/google/shusky/location/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer
 
diff --git a/location/gps.xml b/location/gps.xml
index 87364f4..7fd151a 100644
--- a/location/gps.xml
+++ b/location/gps.xml
@@ -62,6 +62,7 @@
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
        MaxThreadNum="13"
+       SensorsMask="0x244"
   />
 
   <gll
diff --git a/location/gps.xml.hk3 b/location/gps.xml.hk3
index 76c61b0..61e3625 100644
--- a/location/gps.xml.hk3
+++ b/location/gps.xml.hk3
@@ -62,6 +62,7 @@
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
        MaxThreadNum="13"
+       SensorsMask="0x244"
   />
 
   <gll
diff --git a/location/gps.xml.sb3 b/location/gps.xml.sb3
index 4a011fa..c1fe15b 100644
--- a/location/gps.xml.sb3
+++ b/location/gps.xml.sb3
@@ -62,6 +62,7 @@
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
        MaxThreadNum="13"
+       SensorsMask="0x244"
   />
 
   <gll
diff --git a/location/gps_user.xml b/location/gps_user.xml
index 5ae707e..86fa5e3 100644
--- a/location/gps_user.xml
+++ b/location/gps_user.xml
@@ -61,6 +61,7 @@
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
        MaxThreadNum="13"
+       SensorsMask="0x244"
   />
 
   <gll
diff --git a/location/gps_user.xml.hk3 b/location/gps_user.xml.hk3
index 8baba1d..27d43ef 100644
--- a/location/gps_user.xml.hk3
+++ b/location/gps_user.xml.hk3
@@ -61,6 +61,7 @@
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
        MaxThreadNum="13"
+       SensorsMask="0x244"
   />
 
   <gll
diff --git a/location/gps_user.xml.sb3 b/location/gps_user.xml.sb3
index aee51dc..62af598 100644
--- a/location/gps_user.xml.sb3
+++ b/location/gps_user.xml.sb3
@@ -61,6 +61,7 @@
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
        MaxThreadNum="13"
+       SensorsMask="0x244"
   />
 
   <gll
diff --git a/shiba/display_golden_google-bigsurf_cal0.pb b/shiba/display_golden_google-bigsurf_cal0.pb
index 32de5d6..25dd2fb 100644
Binary files a/shiba/display_golden_google-bigsurf_cal0.pb and b/shiba/display_golden_google-bigsurf_cal0.pb differ
diff --git a/shiba/display_golden_google-shoreline_cal0.pb b/shiba/display_golden_google-shoreline_cal0.pb
index 592f8cc..3e67b8c 100644
Binary files a/shiba/display_golden_google-shoreline_cal0.pb and b/shiba/display_golden_google-shoreline_cal0.pb differ