diff --git a/audio/oriole/config/bluetooth_with_le_audio_policy_configuration_7_0.xml b/audio/oriole/config/bluetooth_with_le_audio_policy_configuration_7_0.xml
index e3f27d9..efd7277 100644
--- a/audio/oriole/config/bluetooth_with_le_audio_policy_configuration_7_0.xml
+++ b/audio/oriole/config/bluetooth_with_le_audio_policy_configuration_7_0.xml
@@ -11,6 +11,7 @@
                      channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
         </mixPort>
         <!-- Le Audio Audio Ports -->
+        <mixPort name="le audio broadcast output" role="source" />
         <mixPort name="le audio output" role="source" flags="AUDIO_OUTPUT_FLAG_SPATIALIZER">
             <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                      samplingRates="44100 48000"
@@ -51,6 +52,7 @@
         <devicePort tagName="BLE Headset Out" type="AUDIO_DEVICE_OUT_BLE_HEADSET" role="sink"/>
         <devicePort tagName="BLE Speaker Out" type="AUDIO_DEVICE_OUT_BLE_SPEAKER" role="sink"/>
         <devicePort tagName="BLE Headset In" type="AUDIO_DEVICE_IN_BLE_HEADSET" role="source"/>
+        <devicePort tagName="BLE Broadcast Out" type="AUDIO_DEVICE_OUT_BLE_BROADCAST" role="sink"/>
     </devicePorts>
     <routes>
         <route type="mix" sink="BT A2DP Out"
@@ -66,6 +68,8 @@
         <route type="mix" sink="le audio input"
                sources="BLE Headset In"/>
         <route type="mix" sink="BLE Speaker Out"
-               sources="le audio output"/>
+            sources="le audio output"/>
+        <route type="mix" sink="BLE Broadcast Out"
+            sources="le audio broadcast output"/>
     </routes>
-</module>
+</module>
\ No newline at end of file
diff --git a/audio/raven/config/bluetooth_with_le_audio_policy_configuration_7_0.xml b/audio/raven/config/bluetooth_with_le_audio_policy_configuration_7_0.xml
index e3f27d9..efd7277 100644
--- a/audio/raven/config/bluetooth_with_le_audio_policy_configuration_7_0.xml
+++ b/audio/raven/config/bluetooth_with_le_audio_policy_configuration_7_0.xml
@@ -11,6 +11,7 @@
                      channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
         </mixPort>
         <!-- Le Audio Audio Ports -->
+        <mixPort name="le audio broadcast output" role="source" />
         <mixPort name="le audio output" role="source" flags="AUDIO_OUTPUT_FLAG_SPATIALIZER">
             <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                      samplingRates="44100 48000"
@@ -51,6 +52,7 @@
         <devicePort tagName="BLE Headset Out" type="AUDIO_DEVICE_OUT_BLE_HEADSET" role="sink"/>
         <devicePort tagName="BLE Speaker Out" type="AUDIO_DEVICE_OUT_BLE_SPEAKER" role="sink"/>
         <devicePort tagName="BLE Headset In" type="AUDIO_DEVICE_IN_BLE_HEADSET" role="source"/>
+        <devicePort tagName="BLE Broadcast Out" type="AUDIO_DEVICE_OUT_BLE_BROADCAST" role="sink"/>
     </devicePorts>
     <routes>
         <route type="mix" sink="BT A2DP Out"
@@ -66,6 +68,8 @@
         <route type="mix" sink="le audio input"
                sources="BLE Headset In"/>
         <route type="mix" sink="BLE Speaker Out"
-               sources="le audio output"/>
+            sources="le audio output"/>
+        <route type="mix" sink="BLE Broadcast Out"
+            sources="le audio broadcast output"/>
     </routes>
-</module>
+</module>
\ No newline at end of file
diff --git a/device-oriole.mk b/device-oriole.mk
index e22fb6e..52a9216 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -17,6 +17,14 @@
 # Restrict the visibility of Android.bp files to improve build analysis time
 $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
 
+ifdef RELEASE_GOOGLE_ORIOLE_RADIO_DIR
+RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_ORIOLE_RADIO_DIR)
+endif
+RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR ?= pdk# Keep this for pdk TODO: b/327119000
+RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR)
+$(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR))
+
+
 TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_ORIOLE_VERSION)
 # Keeps flexibility for kasan and ufs builds
 TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_ORIOLE_DIR)
@@ -35,7 +43,6 @@ DEVICE_PACKAGE_OVERLAYS += device/google/raviole/oriole/overlay
 include device/google/raviole/audio/oriole/audio-tables.mk
 include device/google/gs101/device-shipping-common.mk
 include device/google/gs101/telephony/pktrouter.mk
-include hardware/google/pixel/vibrator/cs40l25/device.mk
 include device/google/gs-common/bcmbt/bluetooth.mk
 include device/google/gs-common/touch/stm/stm11.mk
 
@@ -337,5 +344,13 @@ PRODUCT_PRODUCT_PROPERTIES += \
 PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED := true
 
 # Bluetooth device id
+# Oriole: 0x4106
 PRODUCT_PRODUCT_PROPERTIES += \
-    bluetooth.device_id.product_id=20486
+    bluetooth.device_id.product_id=16646
+
+# ETM
+ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG))
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
+endif
+endif
diff --git a/device-raven.mk b/device-raven.mk
index e1c2b1b..3cfe900 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -17,6 +17,14 @@
 # Restrict the visibility of Android.bp files to improve build analysis time
 $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
 
+ifdef RELEASE_GOOGLE_RAVEN_RADIO_DIR
+RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_RAVEN_RADIO_DIR)
+endif
+RELEASE_GOOGLE_BOOTLOADER_RAVEN_DIR ?= pdk# Keep this for pdk TODO: b/327119000
+RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_RAVEN_DIR)
+$(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_RAVEN_DIR))
+
+
 TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_RAVEN_VERSION)
 # Keeps flexibility for kasan and ufs builds
 TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_RAVEN_DIR)
@@ -52,8 +60,6 @@ ifeq ($(filter factory_raven, $(TARGET_PRODUCT)),)
 include device/google/raviole/uwb/uwb_calibration.mk
 endif
 
-include hardware/google/pixel/vibrator/cs40l25/device.mk
-
 # go/lyric-soong-variables
 $(call soong_config_set,lyric,camera_hardware,raven)
 $(call soong_config_set,lyric,tuning_product,raven)
@@ -347,5 +353,13 @@ PRODUCT_PRODUCT_PROPERTIES += \
 PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED := true
 
 # Bluetooth device id
+# Raven: 0x4107
 PRODUCT_PRODUCT_PROPERTIES += \
-    bluetooth.device_id.product_id=20487
+    bluetooth.device_id.product_id=16647
+
+# ETM
+ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG))
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
+endif
+endif
diff --git a/device-slider.mk b/device-slider.mk
index 09eb645..f960cba 100644
--- a/device-slider.mk
+++ b/device-slider.mk
@@ -14,6 +14,10 @@
 # limitations under the License.
 #
 
+RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR ?= pdk# Keep this for pdk TODO: b/327119000
+RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR)
+$(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR))
+
 # Keeps flexibility for kasan and ufs builds
 TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_ORIOLE_DIR)
 TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_ORIOLE_DIR)/kernel-headers
@@ -27,7 +31,6 @@ DEVICE_PACKAGE_OVERLAYS += device/google/raviole/slider/overlay
 
 include device/google/gs101/device-common.mk
 include device/google/raviole/audio/slider/audio-tables.mk
-include hardware/google/pixel/vibrator/cs40l25/device.mk
 include device/google/gs-common/bcmbt/bluetooth.mk
 include device/google/gs-common/gps/brcm/cbd_gps.mk
 include device/google/gs-common/touch/stm/stm11.mk
diff --git a/device-whitefin.mk b/device-whitefin.mk
index f7e19c3..d82b530 100644
--- a/device-whitefin.mk
+++ b/device-whitefin.mk
@@ -14,6 +14,10 @@
 # limitations under the License.
 #
 
+RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR ?= pdk# Keep this for pdk TODO: b/327119000
+RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR)
+$(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR))
+
 # Keeps flexibility for kasan and ufs builds
 TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_ORIOLE_DIR)
 TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_ORIOLE_DIR)/kernel-headers
@@ -26,7 +30,6 @@ $(call inherit-product-if-exists, vendor/google_devices/raviole/proprietary/whit
 DEVICE_PACKAGE_OVERLAYS += device/google/raviole/whitefin/overlay
 
 include device/google/gs101/device-common.mk
-include hardware/google/pixel/vibrator/drv2624/device.mk
 include device/google/raviole/audio/whitefin/audio-tables.mk
 include device/google/gs-common/bcmbt/bluetooth.mk
 include device/google/gs-common/gps/brcm/cbd_gps.mk
diff --git a/location/gps.6.1.xml.oriole b/location/gps.6.1.xml.oriole
index 90abf83..df40156 100644
--- a/location/gps.6.1.xml.oriole
+++ b/location/gps.6.1.xml.oriole
@@ -18,7 +18,7 @@
        SuplLogFullName="/data/vendor/gps/suplflow.txt"
        tlsEnable="true"
 
-       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplSslMethod="SSLv23"
        SuplEnable="true"
        SuplUseApn="false"
        SuplUseApnNI="true"
@@ -49,6 +49,7 @@
        LtoSyncThresholdDays="1"
 
        GnssYearOfHardware="2020"
+       CpEarlyFixGuardTimeSec="1"
        CpGuardTimeSec="1"
        CpLppGuardTimeSec="1"
        IgnoreInjectedSystemTime="true"
@@ -98,6 +99,8 @@
   />
 
   <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
        EnableNavic="true"
   />
diff --git a/location/gps.6.1.xml.raven b/location/gps.6.1.xml.raven
index f759bf5..c831068 100644
--- a/location/gps.6.1.xml.raven
+++ b/location/gps.6.1.xml.raven
@@ -18,7 +18,7 @@
        SuplLogFullName="/data/vendor/gps/suplflow.txt"
        tlsEnable="true"
 
-       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplSslMethod="SSLv23"
        SuplEnable="true"
        SuplUseApn="false"
        SuplUseApnNI="true"
@@ -49,6 +49,7 @@
        LtoSyncThresholdDays="1"
 
        GnssYearOfHardware="2020"
+       CpEarlyFixGuardTimeSec="1"
        CpGuardTimeSec="1"
        CpLppGuardTimeSec="1"
        IgnoreInjectedSystemTime="true"
@@ -98,6 +99,8 @@
   />
 
   <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
        EnableNavic="true"
   />
diff --git a/location/gps.xml b/location/gps.xml
index ef328be..009aaec 100644
--- a/location/gps.xml
+++ b/location/gps.xml
@@ -18,7 +18,7 @@
        SuplLogFullName="/data/vendor/gps/suplflow.txt"
        tlsEnable="true"
 
-       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplSslMethod="SSLv23"
        SuplEnable="true"
        SuplUseApn="false"
        SuplUseApnNI="true"
@@ -49,6 +49,7 @@
        LtoSyncThresholdDays="1"
 
        GnssYearOfHardware="2020"
+       CpEarlyFixGuardTimeSec="1"
        CpGuardTimeSec="1"
        CpLppGuardTimeSec="1"
        IgnoreInjectedSystemTime="true"
@@ -98,6 +99,8 @@
   />
 
   <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
        EnableNavic="true"
   />
diff --git a/location/gps.xml.oriole b/location/gps.xml.oriole
index ae9f6fc..4833857 100644
--- a/location/gps.xml.oriole
+++ b/location/gps.xml.oriole
@@ -18,7 +18,7 @@
        SuplLogFullName="/data/vendor/gps/suplflow.txt"
        tlsEnable="true"
 
-       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplSslMethod="SSLv23"
        SuplEnable="true"
        SuplUseApn="false"
        SuplUseApnNI="true"
@@ -49,6 +49,7 @@
        LtoSyncThresholdDays="1"
 
        GnssYearOfHardware="2020"
+       CpEarlyFixGuardTimeSec="1"
        CpGuardTimeSec="1"
        CpLppGuardTimeSec="1"
        IgnoreInjectedSystemTime="true"
@@ -98,8 +99,11 @@
   />
 
   <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
        EnableNavic="true"
+       ConstellationAutoSwitchOffNavOnly="true"
   />
 
 </glgps>
diff --git a/location/gps.xml.raven b/location/gps.xml.raven
index baea540..d663ebf 100644
--- a/location/gps.xml.raven
+++ b/location/gps.xml.raven
@@ -18,7 +18,7 @@
        SuplLogFullName="/data/vendor/gps/suplflow.txt"
        tlsEnable="true"
 
-       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplSslMethod="SSLv23"
        SuplEnable="true"
        SuplUseApn="false"
        SuplUseApnNI="true"
@@ -49,6 +49,7 @@
        LtoSyncThresholdDays="1"
 
        GnssYearOfHardware="2020"
+       CpEarlyFixGuardTimeSec="1"
        CpGuardTimeSec="1"
        CpLppGuardTimeSec="1"
        IgnoreInjectedSystemTime="true"
@@ -98,8 +99,11 @@
   />
 
   <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
        EnableNavic="true"
+       ConstellationAutoSwitchOffNavOnly="true"
   />
 
 </glgps>
diff --git a/location/gps_user.6.1.xml.oriole b/location/gps_user.6.1.xml.oriole
index 2307636..0582009 100644
--- a/location/gps_user.6.1.xml.oriole
+++ b/location/gps_user.6.1.xml.oriole
@@ -17,7 +17,7 @@
        SuplLogFullName="/data/vendor/gps/suplflow.txt"
        tlsEnable="true"
 
-       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplSslMethod="SSLv23"
        SuplEnable="true"
        SuplUseApn="false"
        SuplUseApnNI="true"
@@ -48,6 +48,7 @@
        LtoSyncThresholdDays="1"
 
        GnssYearOfHardware="2020"
+       CpEarlyFixGuardTimeSec="1"
        CpGuardTimeSec="1"
        CpLppGuardTimeSec="1"
        IgnoreInjectedSystemTime="true"
@@ -96,6 +97,8 @@
   />
 
   <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
        EnableNavic="true"
   />
diff --git a/location/gps_user.6.1.xml.raven b/location/gps_user.6.1.xml.raven
index 00d9b45..c276c11 100644
--- a/location/gps_user.6.1.xml.raven
+++ b/location/gps_user.6.1.xml.raven
@@ -17,7 +17,7 @@
        SuplLogFullName="/data/vendor/gps/suplflow.txt"
        tlsEnable="true"
 
-       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplSslMethod="SSLv23"
        SuplEnable="true"
        SuplUseApn="false"
        SuplUseApnNI="true"
@@ -48,6 +48,7 @@
        LtoSyncThresholdDays="1"
 
        GnssYearOfHardware="2020"
+       CpEarlyFixGuardTimeSec="1"
        CpGuardTimeSec="1"
        CpLppGuardTimeSec="1"
        IgnoreInjectedSystemTime="true"
@@ -96,6 +97,8 @@
   />
 
   <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
        EnableNavic="true"
   />
diff --git a/location/gps_user.xml b/location/gps_user.xml
index a5a4066..008efb0 100644
--- a/location/gps_user.xml
+++ b/location/gps_user.xml
@@ -17,7 +17,7 @@
        SuplLogFullName="/data/vendor/gps/suplflow.txt"
        tlsEnable="true"
 
-       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplSslMethod="SSLv23"
        SuplEnable="true"
        SuplUseApn="false"
        SuplUseApnNI="true"
@@ -48,6 +48,7 @@
        LtoSyncThresholdDays="1"
 
        GnssYearOfHardware="2020"
+       CpEarlyFixGuardTimeSec="1"
        CpGuardTimeSec="1"
        CpLppGuardTimeSec="1"
        IgnoreInjectedSystemTime="true"
@@ -96,6 +97,8 @@
   />
 
   <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
        EnableNavic="true"
   />
diff --git a/location/gps_user.xml.oriole b/location/gps_user.xml.oriole
index e04f9fe..ec8d881 100644
--- a/location/gps_user.xml.oriole
+++ b/location/gps_user.xml.oriole
@@ -17,7 +17,7 @@
        SuplLogFullName="/data/vendor/gps/suplflow.txt"
        tlsEnable="true"
 
-       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplSslMethod="SSLv23"
        SuplEnable="true"
        SuplUseApn="false"
        SuplUseApnNI="true"
@@ -48,6 +48,7 @@
        LtoSyncThresholdDays="1"
 
        GnssYearOfHardware="2020"
+       CpEarlyFixGuardTimeSec="1"
        CpGuardTimeSec="1"
        CpLppGuardTimeSec="1"
        IgnoreInjectedSystemTime="true"
@@ -96,8 +97,11 @@
   />
 
   <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
        EnableNavic="true"
+       ConstellationAutoSwitchOffNavOnly="true"
   />
 
 </glgps>
diff --git a/location/gps_user.xml.raven b/location/gps_user.xml.raven
index c132781..3489a66 100644
--- a/location/gps_user.xml.raven
+++ b/location/gps_user.xml.raven
@@ -17,7 +17,7 @@
        SuplLogFullName="/data/vendor/gps/suplflow.txt"
        tlsEnable="true"
 
-       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplSslMethod="SSLv23"
        SuplEnable="true"
        SuplUseApn="false"
        SuplUseApnNI="true"
@@ -48,6 +48,7 @@
        LtoSyncThresholdDays="1"
 
        GnssYearOfHardware="2020"
+       CpEarlyFixGuardTimeSec="1"
        CpGuardTimeSec="1"
        CpLppGuardTimeSec="1"
        IgnoreInjectedSystemTime="true"
@@ -96,8 +97,11 @@
   />
 
   <gll_features
+       EnableQzsAutoSwitch="false"
+       EnableGloAutoSwitch="false"
        EnableNicAutoSwitch="true"
        EnableNavic="true"
+       ConstellationAutoSwitchOffNavOnly="true"
   />
 
 </glgps>
diff --git a/oriole/BoardConfig.mk b/oriole/BoardConfig.mk
index 757ee50..d77c0ef 100644
--- a/oriole/BoardConfig.mk
+++ b/oriole/BoardConfig.mk
@@ -24,11 +24,6 @@ BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1
 BOARD_KERNEL_CMDLINE += pcie-exynos-core.load_sequential=1
 BOARD_KERNEL_CMDLINE += g2d.load_sequential=1
 
-RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_ORIOLE_RADIO_DIR)
-RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR ?= pdk# Keep this for pdk TODO: b/327119000
-RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR)
-$(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR))
-
 ifdef AUTOMOTIVE_PRODUCT_PATH
   #RBC# include_top device/google/auto_tcu
   #RBC# include_top device/google/pixel_tcu
@@ -47,4 +42,11 @@ include device/google/gs101/BoardConfig-common.mk
 include device/google/gs101-sepolicy/oriole-sepolicy.mk
 include device/google/gs101/wifi/BoardConfig-wifi.mk
 -include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk
+include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
 -include vendor/google_devices/oriole/proprietary/BoardConfigVendor.mk
+
+ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG))
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+-include device/google/common/etm/BoardUserdebugModules.mk
+endif
+endif
diff --git a/raven/BoardConfig.mk b/raven/BoardConfig.mk
index 06f97ae..3d474b6 100644
--- a/raven/BoardConfig.mk
+++ b/raven/BoardConfig.mk
@@ -24,11 +24,6 @@ BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1
 BOARD_KERNEL_CMDLINE += pcie-exynos-core.load_sequential=1
 BOARD_KERNEL_CMDLINE += g2d.load_sequential=1
 
-RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_RAVEN_RADIO_DIR)
-RELEASE_GOOGLE_BOOTLOADER_RAVEN_DIR ?= pdk# Keep this for pdk TODO: b/327119000
-RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_RAVEN_DIR)
-$(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_RAVEN_DIR))
-
 ifdef AUTOMOTIVE_PRODUCT_PATH
   #RBC# include_top device/google/auto_tcu
   #RBC# include_top device/google/pixel_tcu
@@ -47,4 +42,11 @@ include device/google/gs101/BoardConfig-common.mk
 include device/google/gs101-sepolicy/raven-sepolicy.mk
 include device/google/gs101/wifi/BoardConfig-wifi.mk
 -include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk
+include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
 -include vendor/google_devices/raven/proprietary/BoardConfigVendor.mk
+
+ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG))
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+-include device/google/common/etm/BoardUserdebugModules.mk
+endif
+endif
diff --git a/slider/BoardConfig.mk b/slider/BoardConfig.mk
index 917b79a..2224d56 100644
--- a/slider/BoardConfig.mk
+++ b/slider/BoardConfig.mk
@@ -15,9 +15,6 @@
 #
 TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt
 TARGET_BOOTLOADER_BOARD_NAME := slider
-RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR ?= pdk# Keep this for pdk TODO: b/327119000
-RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR)
-$(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR))
 TARGET_SCREEN_DENSITY := 560
 USES_DEVICE_GOOGLE_RAVIOLE := true
 
@@ -26,3 +23,4 @@ BOARD_BOOTCONFIG += androidboot.selinux=permissive
 include device/google/gs101/BoardConfig-common.mk
 include device/google/gs101/wifi/BoardConfig-wifi.mk
 -include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk
+include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
diff --git a/thermal_info_config_charge_oriole.json b/thermal_info_config_charge_oriole.json
index 280dd33..17908e9 100644
--- a/thermal_info_config_charge_oriole.json
+++ b/thermal_info_config_charge_oriole.json
@@ -27,7 +27,6 @@
                 "NAN",
                 "NAN"
             ],
-            "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/adc_channel/channel_temp",
             "VrThreshold":"NAN",
             "Multiplier":0.001
         },
@@ -43,7 +42,6 @@
                 "NAN",
                 "NAN"
             ],
-            "TempPath":"/dev/thermal/tz-by-name/qi_therm/adc_channel/channel_temp",
             "VrThreshold":"NAN",
             "Multiplier":0.001
         },
@@ -59,7 +57,6 @@
                 "NAN",
                 "NAN"
             ],
-            "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/adc_channel/channel_temp",
             "VrThreshold":"NAN",
             "Multiplier":0.001
         },
@@ -84,7 +81,6 @@
                 0.0,
                 0.0
             ],
-            "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/adc_channel/channel_temp",
             "VrThreshold":"NAN",
             "Multiplier":0.001,
             "PollingDelay":60000,
@@ -102,7 +98,6 @@
                 "NAN",
                 "NAN"
             ],
-            "TempPath":"/dev/thermal/tz-by-name/disp_therm/adc_channel/channel_temp",
             "VrThreshold":"NAN",
             "Multiplier":0.001
         },
@@ -127,7 +122,6 @@
                 0.0,
                 0.0
             ],
-            "TempPath":"/dev/thermal/tz-by-name/quiet_therm/adc_channel/channel_temp",
             "VrThreshold":"NAN",
             "Multiplier":0.001,
             "PollingDelay":60000,
diff --git a/thermal_info_config_charge_raven.json b/thermal_info_config_charge_raven.json
index 411383b..bb0c1c4 100644
--- a/thermal_info_config_charge_raven.json
+++ b/thermal_info_config_charge_raven.json
@@ -27,7 +27,6 @@
                 "NAN",
                 "NAN"
             ],
-            "TempPath":"/dev/thermal/tz-by-name/neutral_therm/adc_channel/channel_temp",
             "VrThreshold":"NAN",
             "Multiplier":0.001
         },
@@ -43,7 +42,6 @@
                 "NAN",
                 "NAN"
             ],
-            "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/adc_channel/channel_temp",
             "VrThreshold":"NAN",
             "Multiplier":0.001
         },
@@ -59,7 +57,6 @@
                 "NAN",
                 "NAN"
             ],
-            "TempPath":"/dev/thermal/tz-by-name/qi_therm/adc_channel/channel_temp",
             "VrThreshold":"NAN",
             "Multiplier":0.001
         },
@@ -84,7 +81,6 @@
                 0.0,
                 0.0
             ],
-            "TempPath":"/dev/thermal/tz-by-name/quiet_therm/adc_channel/channel_temp",
             "VrThreshold":"NAN",
             "Multiplier":0.001,
             "PollingDelay":60000,
@@ -102,7 +98,6 @@
                 "NAN",
                 "NAN"
             ],
-            "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/adc_channel/channel_temp",
             "VrThreshold":"NAN",
             "Multiplier":0.001
         },
@@ -127,7 +122,6 @@
                 0.0,
                 0.0
             ],
-            "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/adc_channel/channel_temp",
             "VrThreshold":"NAN",
             "Multiplier":0.001,
             "PollingDelay":60000,
@@ -145,7 +139,6 @@
                 "NAN",
                 "NAN"
             ],
-            "TempPath":"/dev/thermal/tz-by-name/disp_therm/adc_channel/channel_temp",
             "VrThreshold":"NAN",
             "Multiplier":0.001
         },
diff --git a/thermal_info_config_oriole.json b/thermal_info_config_oriole.json
index 2a57b61..e218126 100644
--- a/thermal_info_config_oriole.json
+++ b/thermal_info_config_oriole.json
@@ -19,25 +19,21 @@
         {
             "Name":"neutral_therm",
             "Type":"UNKNOWN",
-            "TempPath":"/dev/thermal/tz-by-name/neutral_therm/adc_channel/channel_temp",
             "Multiplier":0.001
         },
         {
             "Name":"gnss_tcxo_therm",
             "Type":"UNKNOWN",
-            "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/adc_channel/channel_temp",
             "Multiplier":0.001
         },
         {
             "Name":"qi_therm",
             "Type":"UNKNOWN",
-            "TempPath":"/dev/thermal/tz-by-name/qi_therm/adc_channel/channel_temp",
             "Multiplier":0.001
         },
         {
             "Name":"usb_pwr_therm",
             "Type":"UNKNOWN",
-            "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/adc_channel/channel_temp",
             "Multiplier":0.001
         },
         {
@@ -45,7 +41,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NAN", "35.0", "NAN","NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
-            "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/adc_channel/channel_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -53,7 +48,6 @@
         {
             "Name":"disp_therm",
             "Type":"UNKNOWN",
-            "TempPath":"/dev/thermal/tz-by-name/disp_therm/adc_channel/channel_temp",
             "Multiplier":0.001
         },
         {
@@ -61,7 +55,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NAN", "32.9", "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
-            "TempPath":"/dev/thermal/tz-by-name/quiet_therm/adc_channel/channel_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
diff --git a/thermal_info_config_oriole_WHI_A.json b/thermal_info_config_oriole_WHI_A.json
index aa59ee5..1a74ade 100644
--- a/thermal_info_config_oriole_WHI_A.json
+++ b/thermal_info_config_oriole_WHI_A.json
@@ -36,7 +36,6 @@
                 0.0,
                 0.0
             ],
-            "TempPath":"/dev/thermal/tz-by-name/neutral_therm/adc_channel/channel_temp",
             "VrThreshold":"NAN",
             "Multiplier":0.001,
             "PollingDelay":60000,
@@ -54,7 +53,6 @@
                 "NAN",
                 "NAN"
             ],
-            "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/adc_channel/channel_temp",
             "VrThreshold":"NAN",
             "Multiplier":0.001
         },
@@ -70,7 +68,6 @@
                 "NAN",
                 "NAN"
             ],
-            "TempPath":"/dev/thermal/tz-by-name/qi_therm/adc_channel/channel_temp",
             "VrThreshold":"NAN",
             "Multiplier":0.001
         },
diff --git a/thermal_info_config_raven.json b/thermal_info_config_raven.json
index fe72c6b..45c9326 100644
--- a/thermal_info_config_raven.json
+++ b/thermal_info_config_raven.json
@@ -19,19 +19,16 @@
         {
             "Name":"neutral_therm",
             "Type":"UNKNOWN",
-            "TempPath":"/dev/thermal/tz-by-name/neutral_therm/adc_channel/channel_temp",
             "Multiplier":0.001
         },
         {
             "Name":"gnss_tcxo_therm",
             "Type":"UNKNOWN",
-            "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/adc_channel/channel_temp",
             "Multiplier":0.001
         },
         {
             "Name":"qi_therm",
             "Type":"UNKNOWN",
-            "TempPath":"/dev/thermal/tz-by-name/qi_therm/adc_channel/channel_temp",
             "Multiplier":0.001
         },
         {
@@ -39,7 +36,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NAN", "32.2", "NAN", "NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
-            "TempPath":"/dev/thermal/tz-by-name/quiet_therm/adc_channel/channel_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -47,7 +43,6 @@
         {
             "Name":"usb_pwr_therm",
             "Type":"UNKNOWN",
-            "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/adc_channel/channel_temp",
             "Multiplier":0.001
         },
         {
@@ -55,7 +50,6 @@
             "Type":"UNKNOWN",
             "HotThreshold":["NAN", "40.0", "NAN","NAN", "NAN", "NAN", "NAN"],
             "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
-            "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/adc_channel/channel_temp",
             "Multiplier":0.001,
             "PollingDelay":60000,
             "PassiveDelay":7000
@@ -63,7 +57,6 @@
         {
             "Name":"disp_therm",
             "Type":"UNKNOWN",
-            "TempPath":"/dev/thermal/tz-by-name/disp_therm/adc_channel/channel_temp",
             "Multiplier":0.001
         },
         {
diff --git a/whitefin/BoardConfig.mk b/whitefin/BoardConfig.mk
index e28f7bf..27f7c98 100644
--- a/whitefin/BoardConfig.mk
+++ b/whitefin/BoardConfig.mk
@@ -15,9 +15,6 @@
 #
 TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt
 TARGET_BOOTLOADER_BOARD_NAME := whitefin
-RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR ?= pdk# Keep this for pdk TODO: b/327119000
-RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR)
-$(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR))
 TARGET_SCREEN_DENSITY := 440
 USES_DEVICE_GOOGLE_RAVIOLE := true
 
@@ -26,3 +23,4 @@ BOARD_BOOTCONFIG += androidboot.selinux=permissive
 include device/google/gs101/BoardConfig-common.mk
 include device/google/gs101/wifi/BoardConfig-wifi.mk
 -include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk
+include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk