diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index d9d3709..80cec5e 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -19,4 +19,4 @@
     $(LOCAL_DIR)/aosp_sunfish_hwasan.mk \
 
 COMMON_LUNCH_CHOICES := \
-    aosp_sunfish-userdebug \
+    aosp_sunfish-trunk_staging-userdebug \
diff --git a/device.mk b/device.mk
index 3228289..9372bf1 100644
--- a/device.mk
+++ b/device.mk
@@ -932,7 +932,7 @@
 -include hardware/google/pixel/mm/device_legacy.mk
 
 # thermal
--include hardware/google/pixel/thermal/device.mk
+include device/google/gs-common/thermal/thermal_hal/device.mk
 
 # Pixel Logger
 include hardware/google/pixel/PixelLogger/PixelLogger.mk
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index df333e8..4e6be6b 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -212,7 +212,7 @@
     </hal>
     <hal format="aidl" optional="true">
         <name>vendor.google.wifi_ext</name>
-        <version>1</version>
+        <version>2-3</version>
         <interface>
             <name>IWifiExt</name>
             <instance>default</instance>
diff --git a/usb/usb/Android.bp b/usb/usb/Android.bp
index c83f9c4..6f891bb 100644
--- a/usb/usb/Android.bp
+++ b/usb/usb/Android.bp
@@ -38,7 +38,7 @@
         "android.hardware.usb.gadget@1.0",
         "android.hardware.usb-V1-ndk",
         "libcutils",
-        "android.frameworks.stats-V1-ndk",
+        "android.frameworks.stats-V2-ndk",
         "pixelatoms-cpp",
         "libbinder_ndk",
 
@@ -48,7 +48,7 @@
         "libpixelstats",
     ],
     export_shared_lib_headers: [
-        "android.frameworks.stats-V1-ndk",
+        "android.frameworks.stats-V2-ndk",
         "pixelatoms-cpp",
     ],
 }