From 9b4c9a21e5ba7ce7762b3a75c6c5a3d547738903 Mon Sep 17 00:00:00 2001
From: maade93791 <70593890+maade69@users.noreply.github.com>
Date: Mon, 9 Mar 2026 20:41:07 +0300
Subject: [PATCH 1/6] Revert "patch thermal info configs for rango"

This reverts commit 85f77d5c6d3f4c882314e33543349b88788aa767.
---
 src/blobs/copy.ts                     | 23 -----------------------
 vendor-specs/google_devices/rango.yml |  4 ++--
 2 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/src/blobs/copy.ts b/src/blobs/copy.ts
index b7735174b..36d52a298 100644
--- a/src/blobs/copy.ts
+++ b/src/blobs/copy.ts
@@ -75,12 +75,6 @@ async function maybePatch(entry: BlobEntry, srcPath: string, device: string) {
           return patchGpsXml(await readFile(srcPath))
         case 'etc/gnss/gps.cfg':
           return patchGpsCfg(await readFile(srcPath))
-        case 'etc/thermal_info_config.json':
-        case 'etc/thermal_info_config_charge.json':
-          if (device === 'rango') {
-            return patchThermalCfg(await readFile(srcPath))
-          }
-
       }
       if (relPath.startsWith('etc/fstab')) {
         return patchFstab(await readFile(srcPath))
@@ -204,23 +198,6 @@ function patchGpsCfg(orig: string) {
   )
 }
 
-function patchThermalCfg(orig: string) {
-  let dropCoeff = false;
-
-  return replaceLines(orig, (line) => {
-    if (line.includes('"S9M_VDD_TPU_M"')) {
-      dropCoeff = true;
-      return line.replace(/"S9M_VDD_TPU_M",?\s*/, "").replace(/,\s*]/, "]");
-    }
-    if (dropCoeff && line.includes('"Coefficient"')) {
-      dropCoeff = false;
-      return line.replace(/,?\s*[\d.]+(?=\s*])/, "");
-    }
-    return line;
-  });
-}
-
-
 function replaceLines(multiLine: string, callbackFn: (value: string) => string) {
   return multiLine
     .split('\n')
diff --git a/vendor-specs/google_devices/rango.yml b/vendor-specs/google_devices/rango.yml
index 787235c61..890f100b2 100644
--- a/vendor-specs/google_devices/rango.yml
+++ b/vendor-specs/google_devices/rango.yml
@@ -3888,8 +3888,8 @@ proprietary/vendor/etc/tcm_test_cfg.ini: 44c889a3027afaf3eedf2970fbce0c5c5414e3b
 proprietary/vendor/etc/telephony: dir
 proprietary/vendor/etc/telephony/satellite_access_config.json: b5f13c8cd7d582d0c9c204e447201ce4c6ed5f42cb72337683fdf13bc12bc7bf
 proprietary/vendor/etc/telephony/sats2.dat: a5af86cc0c241a931ccd01d2c0f8b4a58aa252632a55064a7aaa750e6f88bf13
-proprietary/vendor/etc/thermal_info_config.json: 8c01de6a0ce9afa830bf9414f1b972455825cf791ba6303f57a5294cdf268991
-proprietary/vendor/etc/thermal_info_config_charge.json: 9b62a8cd33d9eb305839a96bdddfff00495529ecbaa0acf505eb8fa500e51376
+proprietary/vendor/etc/thermal_info_config.json: b84d5263f4d2def92d54b3f4d34f9855e33927a907ca5b8898ea62af67eed0c9
+proprietary/vendor/etc/thermal_info_config_charge.json: 69ba8e450fe020f13b2d0b7a1d9c99cf63a655b9d21ab6d0bc5eb8c5053ce769
 proprietary/vendor/etc/thermal_info_config_stats.json: 88f8a91120dd46141e282c9d9af09bd2b7657bf41180a8b3a830ff7727a819dc
 proprietary/vendor/etc/thermal_info_config_throttling.json: 8b58f6c1107fe1433db4d0345154a14c71996b8ba014b95d628f3351b38f145a
 proprietary/vendor/etc/thermal_info_config_vt.json: dcb48a251d2718243d70c407e3f564100d29a9ded407455062e89436599a701a

From 7b0a3fa2131163e8124fe7e163a3b9ffc152bad5 Mon Sep 17 00:00:00 2001
From: maade93791 <70593890+maade69@users.noreply.github.com>
Date: Tue, 10 Mar 2026 15:01:25 +0300
Subject: [PATCH 2/6] laguna: add perf,power,thermal,battery HAL backports

---
 config/device/common/gen10pixel.yml | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/config/device/common/gen10pixel.yml b/config/device/common/gen10pixel.yml
index 638488282..ece52f98a 100644
--- a/config/device/common/gen10pixel.yml
+++ b/config/device/common/gen10pixel.yml
@@ -4,6 +4,34 @@ includes:
 device:
   platform: laguna
 
+backport_files:
+  vendor:
+    - bin/hw/android.hardware.power-service.pixel-libperfmgr
+    - bin/hw/android.hardware.thermal-service.pixel
+    - bin/hw/vendor.google.google_battery-service
+    - bin/hw/vendor.google.google_battery.ekf.service
+    - bin/pixelstats-vendor
+    - etc/init/hw/init.laguna.rc
+    - etc/init/pixel-bgtasks-experiment.rc
+    - etc/init/pixelstats-vendor.laguna.rc
+    - etc/init/vendor.google.google_battery-default.rc
+    - etc/powerhint.json
+    - etc/pixelstats_config.json
+    - etc/thermal_info_config.json
+    - etc/thermal_info_config_charge.json
+    - etc/thermal_info_config_earlywarnings.json
+    - etc/thermal_info_config_lpm.json
+    - etc/thermal_info_config_stats.json
+    - etc/thermal_info_config_throttling.json
+    - etc/thermal_info_config_vt.json
+    - etc/thermal_info_config_wingboard.json
+    - lib64/libperfmgr.so
+    - lib64/libpixelatoms_defs.so
+    - lib64/libpixelstats.so
+    - lib64/pixel-power-ext-V1-ndk.so
+    - lib64/pixel-power-ext-V2-ndk.so
+    - lib64/pixelatoms-cpp.so
+
 kernel_cmdline_exclusions:
   - init_on_alloc=0
   - init_on_free=1

From 2e3d1023fa47d4e73f2651e89b456e8712ac6dfc Mon Sep 17 00:00:00 2001
From: maade93791 <70593890+maade69@users.noreply.github.com>
Date: Tue, 10 Mar 2026 15:03:08 +0300
Subject: [PATCH 3/6] update file inclusions

---
 config/device/common/file-inclusion.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/config/device/common/file-inclusion.yml b/config/device/common/file-inclusion.yml
index ceed55478..e10095209 100644
--- a/config/device/common/file-inclusion.yml
+++ b/config/device/common/file-inclusion.yml
@@ -768,6 +768,7 @@ filters:
       - vendor/etc/init/mosey.rc
       - vendor/etc/init/nfc-service-default.rc
       - vendor/etc/init/pcie_power.rc
+      - vendor/etc/init/pixel-bgtasks-experiment.rc
       - vendor/etc/init/pixel-experiments-recovery.rc
       - vendor/etc/init/pixel-gnss-default.rc
       - vendor/etc/init/pixel-mm-gki.rc
@@ -926,6 +927,7 @@ filters:
       - vendor/etc/thermal_info_config_backup.json
       - vendor/etc/thermal_info_config_charge.json
       - vendor/etc/thermal_info_config_charge_proto.json
+      - vendor/etc/thermal_info_config_earlywarnings.json
       - vendor/etc/thermal_info_config_lpm.json
       - vendor/etc/thermal_info_config_proactive_skin.json
       - vendor/etc/thermal_info_config_proto.json
@@ -1487,6 +1489,7 @@ filters:
       - vendor/lib64/nos_app_keymaster.so
       - vendor/lib64/nos_app_weaver.so
       - vendor/lib64/pixel-power-ext-V1-ndk.so
+      - vendor/lib64/pixel-power-ext-V2-ndk.so
       - vendor/lib64/pixel_stateresidency_provider_aidl_interface-ndk.so
       - vendor/lib64/pixelatoms-cpp.so
       - vendor/lib64/pixelpowerstats_provider_aidl_interface-cpp.so

From 1d1c6e1f61f8c6240043759b64cd30196a5a2d36 Mon Sep 17 00:00:00 2001
From: maade93791 <70593890+maade69@users.noreply.github.com>
Date: Tue, 10 Mar 2026 15:03:41 +0300
Subject: [PATCH 4/6] laguna: add missing sepolicy contexts

---
 .../platform/laguna/BoardConfig-common.mk     |  1 +
 .../laguna/sepolicy/vendor/genfs_contexts     | 25 +++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 config/mk/google_devices/platform/laguna/sepolicy/vendor/genfs_contexts

diff --git a/config/mk/google_devices/platform/laguna/BoardConfig-common.mk b/config/mk/google_devices/platform/laguna/BoardConfig-common.mk
index 8b7b82eb8..9d8c3b2a9 100644
--- a/config/mk/google_devices/platform/laguna/BoardConfig-common.mk
+++ b/config/mk/google_devices/platform/laguna/BoardConfig-common.mk
@@ -12,3 +12,4 @@ BOARD_PERSISTIMAGE_FILE_SYSTEM_TYPE := f2fs
 
 SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS += vendor/adevtool/config/mk/google_devices/platform/laguna/sepolicy/system_ext/public
 SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += vendor/adevtool/config/mk/google_devices/platform/laguna/sepolicy/system_ext/private
+BOARD_VENDOR_SEPOLICY_DIRS += vendor/adevtool/config/mk/google_devices/platform/laguna/sepolicy/vendor
diff --git a/config/mk/google_devices/platform/laguna/sepolicy/vendor/genfs_contexts b/config/mk/google_devices/platform/laguna/sepolicy/vendor/genfs_contexts
new file mode 100644
index 000000000..75c44cfb9
--- /dev/null
+++ b/config/mk/google_devices/platform/laguna/sepolicy/vendor/genfs_contexts
@@ -0,0 +1,25 @@
+genfscon sysfs /devices/platform/irm_gmc_freq/devfreq/irm_gmc_freq/vote_manager/powerhint_min_freq u:object_r:sysfs_fabric:s0
+genfscon sysfs /firmware/mbfs_root/cpm/thermal/tj/AOC/tz_err_cnt_0 u:object_r:sysfs_vendor_metrics:s0
+genfscon sysfs /firmware/mbfs_root/cpm/thermal/tj/AOC/tz_err_cnt_1 u:object_r:sysfs_vendor_metrics:s0
+genfscon sysfs /firmware/mbfs_root/cpm/thermal/tj/AOC/tz_err_cnt_2 u:object_r:sysfs_vendor_metrics:s0
+genfscon sysfs /firmware/mbfs_root/cpm/thermal/tj/AUR/tz_err_cnt_0 u:object_r:sysfs_vendor_metrics:s0
+genfscon sysfs /firmware/mbfs_root/cpm/thermal/tj/AUR/tz_err_cnt_1 u:object_r:sysfs_vendor_metrics:s0
+genfscon sysfs /firmware/mbfs_root/cpm/thermal/tj/AUR/tz_err_cnt_2 u:object_r:sysfs_vendor_metrics:s0
+genfscon sysfs /firmware/mbfs_root/cpm/thermal/tj/BIG/tz_err_cnt_0 u:object_r:sysfs_vendor_metrics:s0
+genfscon sysfs /firmware/mbfs_root/cpm/thermal/tj/BIG/tz_err_cnt_1 u:object_r:sysfs_vendor_metrics:s0
+genfscon sysfs /firmware/mbfs_root/cpm/thermal/tj/BIG/tz_err_cnt_2 u:object_r:sysfs_vendor_metrics:s0
+genfscon sysfs /firmware/mbfs_root/cpm/thermal/tj/BIG_MID/tz_err_cnt_0 u:object_r:sysfs_vendor_metrics:s0
+genfscon sysfs /firmware/mbfs_root/cpm/thermal/tj/BIG_MID/tz_err_cnt_1 u:object_r:sysfs_vendor_metrics:s0
+genfscon sysfs /firmware/mbfs_root/cpm/thermal/tj/BIG_MID/tz_err_cnt_2 u:object_r:sysfs_vendor_metrics:s0
+genfscon sysfs /firmware/mbfs_root/cpm/thermal/tj/GPU/tz_err_cnt_0 u:object_r:sysfs_vendor_metrics:s0
+genfscon sysfs /firmware/mbfs_root/cpm/thermal/tj/GPU/tz_err_cnt_1 u:object_r:sysfs_vendor_metrics:s0
+genfscon sysfs /firmware/mbfs_root/cpm/thermal/tj/GPU/tz_err_cnt_2 u:object_r:sysfs_vendor_metrics:s0
+genfscon sysfs /firmware/mbfs_root/cpm/thermal/tj/LITTLE/tz_err_cnt_0 u:object_r:sysfs_vendor_metrics:s0
+genfscon sysfs /firmware/mbfs_root/cpm/thermal/tj/LITTLE/tz_err_cnt_1 u:object_r:sysfs_vendor_metrics:s0
+genfscon sysfs /firmware/mbfs_root/cpm/thermal/tj/LITTLE/tz_err_cnt_2 u:object_r:sysfs_vendor_metrics:s0
+genfscon sysfs /firmware/mbfs_root/cpm/thermal/tj/MID/tz_err_cnt_0 u:object_r:sysfs_vendor_metrics:s0
+genfscon sysfs /firmware/mbfs_root/cpm/thermal/tj/MID/tz_err_cnt_1 u:object_r:sysfs_vendor_metrics:s0
+genfscon sysfs /firmware/mbfs_root/cpm/thermal/tj/MID/tz_err_cnt_2 u:object_r:sysfs_vendor_metrics:s0
+genfscon sysfs /firmware/mbfs_root/cpm/thermal/tj/TPU/tz_err_cnt_0 u:object_r:sysfs_vendor_metrics:s0
+genfscon sysfs /firmware/mbfs_root/cpm/thermal/tj/TPU/tz_err_cnt_1 u:object_r:sysfs_vendor_metrics:s0
+genfscon sysfs /firmware/mbfs_root/cpm/thermal/tj/TPU/tz_err_cnt_2 u:object_r:sysfs_vendor_metrics:s0

From 12b48c4474dd4e9770b940b422dc1c50a6735046 Mon Sep 17 00:00:00 2001
From: maade93791 <70593890+maade69@users.noreply.github.com>
Date: Tue, 10 Mar 2026 15:06:08 +0300
Subject: [PATCH 5/6] update vendor-specs/skels

---
 vendor-skels/google_devices/blazer/blazer.mk  |  4 ++
 .../blazer/proprietary/Android.bp             | 11 +++++
 .../google_devices/frankel/frankel.mk         |  4 ++
 .../frankel/proprietary/Android.bp            | 11 +++++
 .../google_devices/mustang/mustang.mk         |  4 ++
 .../mustang/proprietary/Android.bp            | 11 +++++
 .../rango/proprietary/Android.bp              | 11 +++++
 vendor-skels/google_devices/rango/rango.mk    |  3 ++
 vendor-specs/google_devices/blazer.yml        | 44 ++++++++++---------
 vendor-specs/google_devices/frankel.yml       | 44 ++++++++++---------
 vendor-specs/google_devices/mustang.yml       | 44 ++++++++++---------
 vendor-specs/google_devices/rango.yml         | 43 +++++++++---------
 12 files changed, 154 insertions(+), 80 deletions(-)

diff --git a/vendor-skels/google_devices/blazer/blazer.mk b/vendor-skels/google_devices/blazer/blazer.mk
index 3f0ada423..178c53078 100644
--- a/vendor-skels/google_devices/blazer/blazer.mk
+++ b/vendor-skels/google_devices/blazer/blazer.mk
@@ -831,6 +831,7 @@ PRODUCT_PACKAGES += \
     pcie_power_control \
     pixel-experiments-recovery.sh \
     pixel-power-ext-V1-ndk \
+    pixel-power-ext-V2-ndk \
     pixel.gralloc.allocator-V2-service \
     pixel_irq_load_balancer \
     pixel_stateresidency_provider_aidl_interface-ndk \
@@ -1731,6 +1732,7 @@ PRODUCT_COPY_FILES += \
     vendor/google_devices/blazer/proprietary/vendor/etc/init/memtrack.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/memtrack.rc \
     vendor/google_devices/blazer/proprietary/vendor/etc/init/mosey.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/mosey.rc \
     vendor/google_devices/blazer/proprietary/vendor/etc/init/pcie_power.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/pcie_power.rc \
+    vendor/google_devices/blazer/proprietary/vendor/etc/init/pixel-bgtasks-experiment.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/pixel-bgtasks-experiment.rc \
     vendor/google_devices/blazer/proprietary/vendor/etc/init/pixel-experiments-recovery.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/pixel-experiments-recovery.rc \
     vendor/google_devices/blazer/proprietary/vendor/etc/init/pixel-gnss-default.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/pixel-gnss-default.rc \
     vendor/google_devices/blazer/proprietary/vendor/etc/init/pixel-mm-gki.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/pixel-mm-gki.rc \
@@ -1803,6 +1805,8 @@ PRODUCT_COPY_FILES += \
     vendor/google_devices/blazer/proprietary/vendor/etc/telephony/satellite_access_config.json:$(TARGET_COPY_OUT_VENDOR)/etc/telephony/satellite_access_config.json \
     vendor/google_devices/blazer/proprietary/vendor/etc/telephony/sats2.dat:$(TARGET_COPY_OUT_VENDOR)/etc/telephony/sats2.dat \
     vendor/google_devices/blazer/proprietary/vendor/etc/thermal_info_config_charge.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_charge.json \
+    vendor/google_devices/blazer/proprietary/vendor/etc/thermal_info_config_earlywarnings.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_earlywarnings.json \
+    vendor/google_devices/blazer/proprietary/vendor/etc/thermal_info_config_lpm.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_lpm.json \
     vendor/google_devices/blazer/proprietary/vendor/etc/thermal_info_config_stats.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_stats.json \
     vendor/google_devices/blazer/proprietary/vendor/etc/thermal_info_config_throttling.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_throttling.json \
     vendor/google_devices/blazer/proprietary/vendor/etc/thermal_info_config_vt.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_vt.json \
diff --git a/vendor-skels/google_devices/blazer/proprietary/Android.bp b/vendor-skels/google_devices/blazer/proprietary/Android.bp
index 2dee2e2d7..e868b1dfd 100644
--- a/vendor-skels/google_devices/blazer/proprietary/Android.bp
+++ b/vendor-skels/google_devices/blazer/proprietary/Android.bp
@@ -3642,6 +3642,17 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "pixel-power-ext-V2-ndk",
+    owner: "google_devices",
+    target: { android_arm64: { srcs: [ "vendor/lib64/pixel-power-ext-V2-ndk.so" ] } },
+    compile_multilib: "64",
+    check_elf_files: false,
+    prefer: true,
+    strip: { none: true },
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "pixelatoms-cpp",
     owner: "google_devices",
diff --git a/vendor-skels/google_devices/frankel/frankel.mk b/vendor-skels/google_devices/frankel/frankel.mk
index 4c11f3598..1642453ed 100644
--- a/vendor-skels/google_devices/frankel/frankel.mk
+++ b/vendor-skels/google_devices/frankel/frankel.mk
@@ -823,6 +823,7 @@ PRODUCT_PACKAGES += \
     pcie_power_control \
     pixel-experiments-recovery.sh \
     pixel-power-ext-V1-ndk \
+    pixel-power-ext-V2-ndk \
     pixel.gralloc.allocator-V2-service \
     pixel_irq_load_balancer \
     pixel_stateresidency_provider_aidl_interface-ndk \
@@ -1735,6 +1736,7 @@ PRODUCT_COPY_FILES += \
     vendor/google_devices/frankel/proprietary/vendor/etc/init/memtrack.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/memtrack.rc \
     vendor/google_devices/frankel/proprietary/vendor/etc/init/mosey.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/mosey.rc \
     vendor/google_devices/frankel/proprietary/vendor/etc/init/pcie_power.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/pcie_power.rc \
+    vendor/google_devices/frankel/proprietary/vendor/etc/init/pixel-bgtasks-experiment.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/pixel-bgtasks-experiment.rc \
     vendor/google_devices/frankel/proprietary/vendor/etc/init/pixel-experiments-recovery.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/pixel-experiments-recovery.rc \
     vendor/google_devices/frankel/proprietary/vendor/etc/init/pixel-gnss-default.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/pixel-gnss-default.rc \
     vendor/google_devices/frankel/proprietary/vendor/etc/init/pixel-mm-gki.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/pixel-mm-gki.rc \
@@ -1803,6 +1805,8 @@ PRODUCT_COPY_FILES += \
     vendor/google_devices/frankel/proprietary/vendor/etc/telephony/satellite_access_config.json:$(TARGET_COPY_OUT_VENDOR)/etc/telephony/satellite_access_config.json \
     vendor/google_devices/frankel/proprietary/vendor/etc/telephony/sats2.dat:$(TARGET_COPY_OUT_VENDOR)/etc/telephony/sats2.dat \
     vendor/google_devices/frankel/proprietary/vendor/etc/thermal_info_config_charge.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_charge.json \
+    vendor/google_devices/frankel/proprietary/vendor/etc/thermal_info_config_earlywarnings.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_earlywarnings.json \
+    vendor/google_devices/frankel/proprietary/vendor/etc/thermal_info_config_lpm.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_lpm.json \
     vendor/google_devices/frankel/proprietary/vendor/etc/thermal_info_config_stats.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_stats.json \
     vendor/google_devices/frankel/proprietary/vendor/etc/thermal_info_config_throttling.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_throttling.json \
     vendor/google_devices/frankel/proprietary/vendor/etc/thermal_info_config_vt.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_vt.json \
diff --git a/vendor-skels/google_devices/frankel/proprietary/Android.bp b/vendor-skels/google_devices/frankel/proprietary/Android.bp
index d79d6adf1..758adb279 100644
--- a/vendor-skels/google_devices/frankel/proprietary/Android.bp
+++ b/vendor-skels/google_devices/frankel/proprietary/Android.bp
@@ -3602,6 +3602,17 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "pixel-power-ext-V2-ndk",
+    owner: "google_devices",
+    target: { android_arm64: { srcs: [ "vendor/lib64/pixel-power-ext-V2-ndk.so" ] } },
+    compile_multilib: "64",
+    check_elf_files: false,
+    prefer: true,
+    strip: { none: true },
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "pixelatoms-cpp",
     owner: "google_devices",
diff --git a/vendor-skels/google_devices/mustang/mustang.mk b/vendor-skels/google_devices/mustang/mustang.mk
index 68d98dcae..d7bca7fcd 100644
--- a/vendor-skels/google_devices/mustang/mustang.mk
+++ b/vendor-skels/google_devices/mustang/mustang.mk
@@ -831,6 +831,7 @@ PRODUCT_PACKAGES += \
     pcie_power_control \
     pixel-experiments-recovery.sh \
     pixel-power-ext-V1-ndk \
+    pixel-power-ext-V2-ndk \
     pixel.gralloc.allocator-V2-service \
     pixel_irq_load_balancer \
     pixel_stateresidency_provider_aidl_interface-ndk \
@@ -1731,6 +1732,7 @@ PRODUCT_COPY_FILES += \
     vendor/google_devices/mustang/proprietary/vendor/etc/init/memtrack.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/memtrack.rc \
     vendor/google_devices/mustang/proprietary/vendor/etc/init/mosey.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/mosey.rc \
     vendor/google_devices/mustang/proprietary/vendor/etc/init/pcie_power.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/pcie_power.rc \
+    vendor/google_devices/mustang/proprietary/vendor/etc/init/pixel-bgtasks-experiment.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/pixel-bgtasks-experiment.rc \
     vendor/google_devices/mustang/proprietary/vendor/etc/init/pixel-experiments-recovery.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/pixel-experiments-recovery.rc \
     vendor/google_devices/mustang/proprietary/vendor/etc/init/pixel-gnss-default.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/pixel-gnss-default.rc \
     vendor/google_devices/mustang/proprietary/vendor/etc/init/pixel-mm-gki.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/pixel-mm-gki.rc \
@@ -1802,6 +1804,8 @@ PRODUCT_COPY_FILES += \
     vendor/google_devices/mustang/proprietary/vendor/etc/telephony/satellite_access_config.json:$(TARGET_COPY_OUT_VENDOR)/etc/telephony/satellite_access_config.json \
     vendor/google_devices/mustang/proprietary/vendor/etc/telephony/sats2.dat:$(TARGET_COPY_OUT_VENDOR)/etc/telephony/sats2.dat \
     vendor/google_devices/mustang/proprietary/vendor/etc/thermal_info_config_charge.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_charge.json \
+    vendor/google_devices/mustang/proprietary/vendor/etc/thermal_info_config_earlywarnings.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_earlywarnings.json \
+    vendor/google_devices/mustang/proprietary/vendor/etc/thermal_info_config_lpm.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_lpm.json \
     vendor/google_devices/mustang/proprietary/vendor/etc/thermal_info_config_stats.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_stats.json \
     vendor/google_devices/mustang/proprietary/vendor/etc/thermal_info_config_throttling.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_throttling.json \
     vendor/google_devices/mustang/proprietary/vendor/etc/thermal_info_config_vt.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_vt.json \
diff --git a/vendor-skels/google_devices/mustang/proprietary/Android.bp b/vendor-skels/google_devices/mustang/proprietary/Android.bp
index 2dee2e2d7..e868b1dfd 100644
--- a/vendor-skels/google_devices/mustang/proprietary/Android.bp
+++ b/vendor-skels/google_devices/mustang/proprietary/Android.bp
@@ -3642,6 +3642,17 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "pixel-power-ext-V2-ndk",
+    owner: "google_devices",
+    target: { android_arm64: { srcs: [ "vendor/lib64/pixel-power-ext-V2-ndk.so" ] } },
+    compile_multilib: "64",
+    check_elf_files: false,
+    prefer: true,
+    strip: { none: true },
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "pixelatoms-cpp",
     owner: "google_devices",
diff --git a/vendor-skels/google_devices/rango/proprietary/Android.bp b/vendor-skels/google_devices/rango/proprietary/Android.bp
index b16ab0e99..cd7d1e3dd 100644
--- a/vendor-skels/google_devices/rango/proprietary/Android.bp
+++ b/vendor-skels/google_devices/rango/proprietary/Android.bp
@@ -3698,6 +3698,17 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "pixel-power-ext-V2-ndk",
+    owner: "google_devices",
+    target: { android_arm64: { srcs: [ "vendor/lib64/pixel-power-ext-V2-ndk.so" ] } },
+    compile_multilib: "64",
+    check_elf_files: false,
+    prefer: true,
+    strip: { none: true },
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "pixelatoms-cpp",
     owner: "google_devices",
diff --git a/vendor-skels/google_devices/rango/rango.mk b/vendor-skels/google_devices/rango/rango.mk
index 38671a335..eef7ea81f 100644
--- a/vendor-skels/google_devices/rango/rango.mk
+++ b/vendor-skels/google_devices/rango/rango.mk
@@ -852,6 +852,7 @@ PRODUCT_PACKAGES += \
     pcie_power_control \
     pixel-experiments-recovery.sh \
     pixel-power-ext-V1-ndk \
+    pixel-power-ext-V2-ndk \
     pixel.gralloc.allocator-V2-service \
     pixel_irq_load_balancer \
     pixel_stateresidency_provider_aidl_interface-ndk \
@@ -1764,6 +1765,7 @@ PRODUCT_COPY_FILES += \
     vendor/google_devices/rango/proprietary/vendor/etc/init/memtrack.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/memtrack.rc \
     vendor/google_devices/rango/proprietary/vendor/etc/init/mosey.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/mosey.rc \
     vendor/google_devices/rango/proprietary/vendor/etc/init/pcie_power.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/pcie_power.rc \
+    vendor/google_devices/rango/proprietary/vendor/etc/init/pixel-bgtasks-experiment.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/pixel-bgtasks-experiment.rc \
     vendor/google_devices/rango/proprietary/vendor/etc/init/pixel-experiments-recovery.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/pixel-experiments-recovery.rc \
     vendor/google_devices/rango/proprietary/vendor/etc/init/pixel-gnss-default.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/pixel-gnss-default.rc \
     vendor/google_devices/rango/proprietary/vendor/etc/init/pixel-mm-gki.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/pixel-mm-gki.rc \
@@ -1837,6 +1839,7 @@ PRODUCT_COPY_FILES += \
     vendor/google_devices/rango/proprietary/vendor/etc/telephony/satellite_access_config.json:$(TARGET_COPY_OUT_VENDOR)/etc/telephony/satellite_access_config.json \
     vendor/google_devices/rango/proprietary/vendor/etc/telephony/sats2.dat:$(TARGET_COPY_OUT_VENDOR)/etc/telephony/sats2.dat \
     vendor/google_devices/rango/proprietary/vendor/etc/thermal_info_config_charge.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_charge.json \
+    vendor/google_devices/rango/proprietary/vendor/etc/thermal_info_config_lpm.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_lpm.json \
     vendor/google_devices/rango/proprietary/vendor/etc/thermal_info_config_stats.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_stats.json \
     vendor/google_devices/rango/proprietary/vendor/etc/thermal_info_config_throttling.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_throttling.json \
     vendor/google_devices/rango/proprietary/vendor/etc/thermal_info_config_vt.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_vt.json \
diff --git a/vendor-specs/google_devices/blazer.yml b/vendor-specs/google_devices/blazer.yml
index fee8f6560..c8f1b9297 100644
--- a/vendor-specs/google_devices/blazer.yml
+++ b/vendor-specs/google_devices/blazer.yml
@@ -5,7 +5,7 @@ README.md: 67464562708c327ac7d860acd961ddfe241520ee5fced97b1ffc50438281ba8f
 apk-parser-config: dir
 apk-parser-config/Android.bp: 6d6401321d50122166ac7cd71142453a4e2e217812b514b04b8e958d24532585
 apk-parser-config/apk-parser-config.pb: 8ed7c1728f20bef8de85582e922a47957c5caf2ae07b762910c3f279bfa06a16
-blazer.mk: 6aefa39e9c607f6d82977a3612f7603042b82f987b3e06cac0abe6630d1c85ed
+blazer.mk: edc90fb52b38c7e2472d5659f50b58fa4fcbe28dbf249bddc0722997df81e1a7
 cmds-for-envsetup.sh: 51977112a1dc1ad88e2bb59d9db8704e2598b81540fedca9daf1a318c8611f69
 firmware: dir
 firmware/abl.img: 7a5bde5eb4691a9f04f80df423eaba612554fa85481c72d0b4eff8e95d8cb63c
@@ -2371,7 +2371,7 @@ overlays/framework-res__blazer__auto_generated_rro_vendor/res/xml/irq_device_map
 overlays/framework-res__blazer__auto_generated_rro_vendor/res/xml/power_profile.xml: 87081aaec17d244c6bb162167e28e4d87bb4559bd3df1291cc28d0aaee20ff6a
 overlays/overlay-modules.txt: 8754355a8e41c06269992fd8b47e62bf32e2efa8082e3efd9a18e506dc27dedd
 proprietary: dir
-proprietary/Android.bp: 87ebb84539b9124538a608d776e779e24a0ae624e6a39f3db912a7a7a59fb046
+proprietary/Android.bp: c0abd12f893817a908e9a51ce3ac173f3248877d320550ee76b699e1e8b78a12
 proprietary/linker.config-vendor.json: 8d2bf5bd2dd2946cfbdd6c00645b637342de3946abae68fb6c97350fda82a8e5
 proprietary/product: dir
 proprietary/product/etc: dir
@@ -3147,7 +3147,7 @@ proprietary/vendor/bin/hw/android.hardware.input.processor-service: f7c353f55f7e
 proprietary/vendor/bin/hw/android.hardware.memtrack-service.pixel: bb052b9851b35d509f6db20589f4bab0830d7e15a73abad618690d58deb7dfb6
 proprietary/vendor/bin/hw/android.hardware.neuralnetworks@service-darwinn-aidl: d6b55d9996e7264b49a66ced195e33fc962720c57e8df187e24a0b6a54d5d796
 proprietary/vendor/bin/hw/android.hardware.oemlock-service.citadel: 617d322dcd769c8fa9bd87632fdc8d85ed4c25dae082f1cc5d8d009613367f44
-proprietary/vendor/bin/hw/android.hardware.power-service.pixel-libperfmgr: 2273d3f823e42a9b1cda9b1465881dbb09250a1d46cc1b0d170094d4b79e6a1e
+proprietary/vendor/bin/hw/android.hardware.power-service.pixel-libperfmgr: ecbd7b1ef8efce3db6c05417e696a2786ba4ee93f5a2934afa5a3eecf2c82ce6
 proprietary/vendor/bin/hw/android.hardware.power.stats-service.pixel: 1ad092f01bcbd031f832da5f8a58fd5dedef5f755b7ca47d1d5ecfe547538ced
 proprietary/vendor/bin/hw/android.hardware.samsung.uwb-service: 3dc073de7d50c3045ad9e2562d3d20ba609758fce871a7c67d769f2c6a374cde
 proprietary/vendor/bin/hw/android.hardware.secure_element-service.uicc: e8134229d6f0045bb9199d96592541c1f28a5a5d51bb341052da755ddce8c3d7
@@ -3176,8 +3176,8 @@ proprietary/vendor/bin/hw/vendor.dolby.media.c2@1.0-service: 34ad8e2e8a1a81e92f7
 proprietary/vendor/bin/hw/vendor.google.aam-service: a3b99556f33a90e81e290db4aa1c40f6a59236c9868c8ac517342dd379c0b277
 proprietary/vendor/bin/hw/vendor.google.ambience_hub-service: 973545960fc9ee36bf2eb1b7effb5b25e286e67c7e822723ecdb0bf80d8bf6dc
 proprietary/vendor/bin/hw/vendor.google.edgetpu_vendor_service@1.0-service: 9b5c56368cd0493fc8e9edb8d19b1cf95dbb8dc03742d5cee37046d672c16893
-proprietary/vendor/bin/hw/vendor.google.google_battery-service: bf7cbdd037cec2082a5d7a9e312c6658f37cc10d5704f89cec35fa957b5d79b0
-proprietary/vendor/bin/hw/vendor.google.google_battery.ekf.service: 87d71f11374a4fee701d45a08642a3fca06a80f5cce0262e99b385cc6273da99
+proprietary/vendor/bin/hw/vendor.google.google_battery-service: a35d66d4eb3d9b7af890d0e805d689872873910be9f916871bfe65ea36f30327
+proprietary/vendor/bin/hw/vendor.google.google_battery.ekf.service: ab34437b8189eed637f3a52eea66edd200c8a61ec0b00eff0dba5d6c835be219
 proprietary/vendor/bin/hw/vendor.google.plat_security-service: d2ee6278eb3d824e270273b817723cd049c3bce56a6d8eb208eea6f9946eeded
 proprietary/vendor/bin/hw/vendor.google.radioext@1.0-service: 7ba7ddf0f1f43b0ec253b89ac8422934c22de30d5cbc9a29d75d6dc347c86eeb
 proprietary/vendor/bin/hw/vendor.google.wireless_charger-default: 8db32152df691da70333bb8ee974937af1ab8afbf213e272ff84018dfc98922b
@@ -3194,7 +3194,7 @@ proprietary/vendor/bin/mosey_server: fbfee9abc51d3a0c0686a13f9e17247414ed727d14a
 proprietary/vendor/bin/pcie_power_control: cfaa62ad3fc3247c1b0fefd96db0a557070b835fd2dabea7430cf32052193c29
 proprietary/vendor/bin/pixel-experiments-recovery.sh: 82ef9fa667e65eb7bbf2030aac54ca685eb44466ed33ce251321c45a45a2bcda
 proprietary/vendor/bin/pixel_irq_load_balancer: 637cd5910c9417acf5287c33ec2355c38b753f019ce78741f9c07aa13c5e66dc
-proprietary/vendor/bin/pixelstats-vendor: a926589fef82cbe49c7a92ccb649b7a71ad850fc94e8ebf924b8fcb74409c49d
+proprietary/vendor/bin/pixelstats-vendor: 367c6ee6d8fdf83d6f119020dc59068438d7fd3294fababf70c4ff0ea140a389
 proprietary/vendor/bin/predump_touch.sh: 153c0625e2d262e4f8973915b32ade9fd9e197148f0586dbfdc1ebc53e7e0366
 proprietary/vendor/bin/pvrhwperfd: 13bab94a5303cf2df36a7eddee512d27ff8b3a24d03e4bbcc66c9700c57b8674
 proprietary/vendor/bin/rebalance_interrupts-vendor: 62e442f9d929d06dad5810c54b86f0837330723b6df8760cf06fedd1ed8456ad
@@ -3491,7 +3491,7 @@ proprietary/vendor/etc/init/hostapd.android.rc: a09021175637f73d790f1015b849e3a6
 proprietary/vendor/etc/init/hw: dir
 proprietary/vendor/etc/init/hw/init.blazer.rc: 685822e875a7ac3034b917558dd743db9b014373c1dbf251a127fdef89b87bef
 proprietary/vendor/etc/init/hw/init.efs.rc: 0548cc00099c183948381cbbb611e014fe5a23c70cc04b6eb148c5315ea1a15a
-proprietary/vendor/etc/init/hw/init.laguna.rc: b2544e7442a367c15e7799376e905037c0053145ff6dfcd8f174ea9dc067cf21
+proprietary/vendor/etc/init/hw/init.laguna.rc: 93f137c9c5c34e863691f22726ea64de2c855b626c2698f11a8104e88c5f9859
 proprietary/vendor/etc/init/hw/init.laguna.usb.rc: 6a9fbca25ab20c8f4cb5cb9ee2a04dc7b9fb0b8e6a3477ffd8be0d23653db458
 proprietary/vendor/etc/init/hw/init.persist.rc: 6065d8794876c77ac56246b8533561c3adfaabe3dec10d397ebe32f442416088
 proprietary/vendor/etc/init/init.aoc.rc: fbb768e18e950c9b96f2aa5110cfb673898e2e7b154af197736ddbe45909b879
@@ -3522,13 +3522,14 @@ proprietary/vendor/etc/init/libg3a_ghawb.rc: a89584a12ddd9c63fab8e63d312c811ca35
 proprietary/vendor/etc/init/memtrack.rc: c32b9eab16fbe57816e8672a02cb08ac68ccf90c28ab32135b80dc9512fb5dd4
 proprietary/vendor/etc/init/mosey.rc: 610bfff12609ab93d2eb7fdab84fccf24861e65d9e7b3a84629d24f77245f727
 proprietary/vendor/etc/init/pcie_power.rc: 52ef7306b1251e395958da6a4deb41192c26dd4aa92ca06f2e1b4346afd08881
+proprietary/vendor/etc/init/pixel-bgtasks-experiment.rc: 625697146738f6f795b0bd2fecc9f2e8db0642a06fb27bd40e8cab42e01757e5
 proprietary/vendor/etc/init/pixel-experiments-recovery.rc: 6867dcf1d5dc2eb30f9d1204f9c23052c25a5c5eb72b8d9325df1c230134f41d
 proprietary/vendor/etc/init/pixel-gnss-default.rc: 7eac3bbf4f5a1adffad4a1c4a5180fa4950e746b161ebc31cdd06fc217014781
 proprietary/vendor/etc/init/pixel-mm-gki.rc: 44373966ed3217974c377e106787280a065a4547ebf7ed47c12f2a13b969766f
 proprietary/vendor/etc/init/pixel-thermal-symlinks.rc: a8cb65590b1f74e29c4983978d9421074606b8a1ba13ba09d0b4f0f43ddde8ec
 proprietary/vendor/etc/init/pixel-ubp-experiment.rc: 8b41a7b0bea90343ed824d42bc91b0e7f114c9348e4bce2c606f9a642de269c1
 proprietary/vendor/etc/init/pixel.gralloc.allocator-V2-service.rc: fdcee85a508657b4f6406449a6a74e6fa64d80e7e4b262e887781b70130a8326
-proprietary/vendor/etc/init/pixelstats-vendor.laguna.rc: 84b27752dd5f296db87919d1f61ddfcfa3826d64740ef875ab3eac0fef26f6a2
+proprietary/vendor/etc/init/pixelstats-vendor.laguna.rc: 25b2b2ffa90c0670d4922fd48fcb302a2e5237ef5f98d02173dcce00124d138f
 proprietary/vendor/etc/init/pktrouter.rc: 8b3aacd550bdbab4c2b3897145bd866fb6a472867006b673f52ae3c29c7f67d5
 proprietary/vendor/etc/init/qfp-daemon.rc: dc38fca9a19b37cbb795fae4a497d5c51610209626f3362438162ac9c88b7c0e
 proprietary/vendor/etc/init/rebalance_interrupts-vendor.gs101.rc: 156312a4b8667b8b6401c0371bdc6384b186219e5106f5b33e6b854c22ef7668
@@ -3543,7 +3544,7 @@ proprietary/vendor/etc/init/vendor.google.aam.rc: f4e184b3c444dd663e7a30c27b8cb4
 proprietary/vendor/etc/init/vendor.google.ambience_hub-default.rc: 1a689294a792dac010819f7052a9ef4b15825e733a1fadcb2af844dea49aa456
 proprietary/vendor/etc/init/vendor.google.battery_mitigation-default.rc: 460c8df5ebd8b116f778ca7a7d69ed2cd7190cdab40b12599af390a35dcd9ac0
 proprietary/vendor/etc/init/vendor.google.edgetpu_vendor_service@1.0-service.rc: 145a79e37a278bd8e251b1261f9f361efd72ce1451135898dcdc552b275d49c7
-proprietary/vendor/etc/init/vendor.google.google_battery-default.rc: 74a3d3cc6af6bcfa39b093ffd8eb2be5d39c96f00a7c4b23a782d50c9198671b
+proprietary/vendor/etc/init/vendor.google.google_battery-default.rc: 8fbd37a50e1df34ead209f87948aeba3b102e45d7a4cb40272fd5b1a76cdbf70
 proprietary/vendor/etc/init/vendor.google.google_battery.ekf-default.rc: 4c8c840cb4926a789b5038936970ab3d2c25e020966b0efb720f383f0565be75
 proprietary/vendor/etc/init/vendor.google.modem_ml_svc_sit.rc: bc13061d7c8b5fcb7942ea0f29e3cfbc204f84bc3013fb1ccfbdd6fb9696c6a6
 proprietary/vendor/etc/init/vendor.google.plat_security-service.rc: 8651367b7fa2ce1012ec830e61d856c91620cd9e20382dd36ee67e801ffbbde1
@@ -3579,8 +3580,8 @@ proprietary/vendor/etc/modem_stat.conf: d8a9b8181f35f3537a0b60994b758d166596c147
 proprietary/vendor/etc/open_carrier_info.dat: 3704b6d7e0f9fe8c792d68dbb75c4001d26137cf4edf6f1f7d51c26175867a8f
 proprietary/vendor/etc/panel_config_google-bzea_cal0.pb: 5ecf375b4d9138f3e260296ae205428e220abbee5ae1a5fcf0057515e4146f21
 proprietary/vendor/etc/panel_ctrl_google-bzea_cal0.pb: b7efd6362325b63923a0b73f731eac0a257887c3cd557953b4568e9567bcd1a3
-proprietary/vendor/etc/pixelstats_config.json: 4115cbeeffe38730cf09f32df1c4127601c7f4014f5fc07fd23072fb71f7c28d
-proprietary/vendor/etc/powerhint.json: e57cc78c535f9964ebabd26dc84dc635f76fb6260aa2e8c74079e872fafb77ab
+proprietary/vendor/etc/pixelstats_config.json: 626179e230507484f27cafd2611ec33b30c7f695240614ecd62221a8147b38a0
+proprietary/vendor/etc/powerhint.json: 49c6f842598de587654b6d40133356ed6368df17a9fe34bb9b82feeeb0528036
 proprietary/vendor/etc/powervr.ini: 90a42e7fa6983287dde8c4af39cb8c8ff6f997d0f333e1a279fb02864acb627e
 proprietary/vendor/etc/public.libraries.txt: c094291bff1c4b4495a3d3695c3b6ad87cd2908e8d091d483abc2e8bf300e857
 proprietary/vendor/etc/res: dir
@@ -3610,12 +3611,14 @@ proprietary/vendor/etc/tcm_test_cfg.ini: c3eb292c40b460f8f390a5c72ff4c835f06a0ac
 proprietary/vendor/etc/telephony: dir
 proprietary/vendor/etc/telephony/satellite_access_config.json: b5f13c8cd7d582d0c9c204e447201ce4c6ed5f42cb72337683fdf13bc12bc7bf
 proprietary/vendor/etc/telephony/sats2.dat: a5af86cc0c241a931ccd01d2c0f8b4a58aa252632a55064a7aaa750e6f88bf13
-proprietary/vendor/etc/thermal_info_config.json: 6f49fb7f87752958c3dbddc7cc1917c31f2cce19a1a2a8ca3363b6921ed3b638
+proprietary/vendor/etc/thermal_info_config.json: 4193e77bf9469365192f5cd53df00b6817f996af1e42dc10bb7439b489d52326
 proprietary/vendor/etc/thermal_info_config_charge.json: 2b8458a4e31971b487ba87d2947f31a5d28316f62ef71ee8ba7c0f8ab21c7b0c
-proprietary/vendor/etc/thermal_info_config_stats.json: 25a5aabdac74f6eb79dd29467f48f208a5652ef14640a77a595dc2dd451af7cc
-proprietary/vendor/etc/thermal_info_config_throttling.json: 8b58f6c1107fe1433db4d0345154a14c71996b8ba014b95d628f3351b38f145a
+proprietary/vendor/etc/thermal_info_config_earlywarnings.json: b3bdaca7abe12e278cb90a71b804dfc726057bf6c8db5a8810b303c2a818835b
+proprietary/vendor/etc/thermal_info_config_lpm.json: 6c56126c13992eb4dd2e94353eacac736c6f73c42d35f39ee9f7d073336808f8
+proprietary/vendor/etc/thermal_info_config_stats.json: 0d77a20c3885465f4fe71ff2fc5f30162aaf804609df0947cec319c27028e0fb
+proprietary/vendor/etc/thermal_info_config_throttling.json: d58d5aa39e2189073c520ae67420008aff2e790915f16bfa87825603d9077140
 proprietary/vendor/etc/thermal_info_config_vt.json: dcb48a251d2718243d70c407e3f564100d29a9ded407455062e89436599a701a
-proprietary/vendor/etc/thermal_info_config_wingboard.json: 317fcfa01c84d1e082ad946e3f01de2e2f1b0e0b010228f56ed7d9129754234d
+proprietary/vendor/etc/thermal_info_config_wingboard.json: 34a63a2e41692b2268900e028391fa692f86ea8109bc65aa67891d1223d7afb0
 proprietary/vendor/etc/thread_power_limits.csv: d3fff9a4fc58a45fb30b9ba4dd8a5ab7cbdec867206592b1ae455516f45055a8
 proprietary/vendor/etc/thread_power_limits_CA.csv: 496124d8777af769313e007d041f34a268076c0ea380f2b71322f38d7652d6cc
 proprietary/vendor/etc/thread_power_limits_EU.csv: d3fff9a4fc58a45fb30b9ba4dd8a5ab7cbdec867206592b1ae455516f45055a8
@@ -6554,10 +6557,10 @@ proprietary/vendor/lib64/libnos_transport.so: 57de206f40b6ed9841bbfaacaf441ff904
 proprietary/vendor/lib64/libnosprotos.so: 537f38b0cdfc2b1b6e4113e8f5341c9f6ec1d6168c99244541948f1aad6be995
 proprietary/vendor/lib64/liboemcrypto.so: 044ecd5337215475428e9cc112356f90d6ed9e0e3b6c690a21f20418246f3bfe
 proprietary/vendor/lib64/liboemservice.so: 0a9c28f9c586956a15b28640c3d45f8876d68ff8825918583534cbccc792550d
-proprietary/vendor/lib64/libperfmgr.so: a92ca32c238d02b181575ee04053dbc60d7cdc3f1ccb43a9545ceba7152b7053
-proprietary/vendor/lib64/libpixelatoms_defs.so: bf3c49f9e7ef30ffc5fd43bd2b7429e95877e2182f01e47306cd209c0ddfeca5
+proprietary/vendor/lib64/libperfmgr.so: 4fa20f9fb81ef7b718105ee9b2ea3d6bad3698bc87601e282e65df14b71a33c1
+proprietary/vendor/lib64/libpixelatoms_defs.so: 48f124a67101f9b76422372cb77983202de19534e926e23b5ccd01fb5842d9e3
 proprietary/vendor/lib64/libpixelhealth.so: 729eabed07f0a2d545643854ce11b6c41c8e02fe143b97715e94af384c957c62
-proprietary/vendor/lib64/libpixelstats.so: cff3d6cdf1a3eb7ccb84dd45bd1a2cbc80b090d8f7e7347f3048895470f6b4d2
+proprietary/vendor/lib64/libpixelstats.so: a5b73fc28bdfc93d712295872857d66832bb5a2308645a93d68ae2c7f9c16e6c
 proprietary/vendor/lib64/libprotobuf-cpp-full-6.33.1.so: 7fdedeb80d9fa171eef04cbe1f7657dcddf46d36acf7eee9bb78820af189fb96
 proprietary/vendor/lib64/libprotobuf-cpp-lite-6.33.1.so: 1a5f05c5ffb76931735c0c38979d3a67b690bd088e05d8f45d448debbcc84f89
 proprietary/vendor/lib64/libqfp-service.so: cc9bf00ffbafdd40aec181b87d4e198a519ebfc1ac271617b85f644f4d2ee407
@@ -6601,9 +6604,10 @@ proprietary/vendor/lib64/modemml-tflite-service-aidl-V1-ndk.so: 1ae60aae45d38bac
 proprietary/vendor/lib64/nos_app_avb.so: edfc3c830b130765972929b9ffc3bcc394f7e340b0991fbe64732d9f081e2bbb
 proprietary/vendor/lib64/nos_app_keymaster.so: d9e45a70cbfb1a405b048a1366df96e505071ffbb07871b1eb1fd2e5187299ba
 proprietary/vendor/lib64/nos_app_weaver.so: 63ce1b1e9c13194ffb489788034b21ee072f3536d1fd6afb2fc5bb5eee04df2a
-proprietary/vendor/lib64/pixel-power-ext-V1-ndk.so: 76277a94f25aae9adc48852dce84443f087f5ecf5d124addb2955475310e9912
+proprietary/vendor/lib64/pixel-power-ext-V1-ndk.so: e0751ac492b3a1961833196812058ceaaea6ad103e2c19f35dc06422a0235f61
+proprietary/vendor/lib64/pixel-power-ext-V2-ndk.so: f7309ffda361bb88d5d27a6b45b1b31232f73e3b89d1cce0a018e467557ca376
 proprietary/vendor/lib64/pixel_stateresidency_provider_aidl_interface-ndk.so: a72e50e826432a371a3729fdfbb1f9cf6ef27759bfe8a6c297ab37d15ca9d600
-proprietary/vendor/lib64/pixelatoms-cpp.so: e9038aac254a859d91bb86cf86d50e1813570ef4ac1763fc8d65d0ce782b87c8
+proprietary/vendor/lib64/pixelatoms-cpp.so: 9cf6b2866da556c306a47ed0018a8a6bf31a9116391d1c2b69a566fd95ad498b
 proprietary/vendor/lib64/pixelpowerstats_provider_aidl_interface-cpp.so: e91ed340e63dfd9233703634e1061a5563d8cb4fdbfe7bb5130a6fb80876ee0a
 proprietary/vendor/lib64/sensors.usf.so: c72b1314d692ef7adc97d078598cd978bbd026d14df43cc0fb42a96a781e3086
 proprietary/vendor/lib64/soundfx: dir
diff --git a/vendor-specs/google_devices/frankel.yml b/vendor-specs/google_devices/frankel.yml
index e7f844684..83334836f 100644
--- a/vendor-specs/google_devices/frankel.yml
+++ b/vendor-specs/google_devices/frankel.yml
@@ -33,7 +33,7 @@ firmware/gsa_fw.img: da9e2eab0bb98f574bf5008c88231c424c4b5316f2d806955b8c025acba
 firmware/modem.img: 4f054206715985f9db03df547193bc2a44115f3c699a99a27bc5b69697e1b248
 firmware/radio.img: a9d1296f3079798ef91d2173b99e4d9bfe469a2cc596328b13e057107b407503
 firmware/tzsw.img: 4efd78195ce6610cd133d202f631e66fe000bb0b479a48aa441ef1e14e0d07c6
-frankel.mk: 3cd735dbe019c0d529c3b6d995f8d63ead0d0e8fb96027826517a0587d873e6c
+frankel.mk: 9e79cb68f2c68bbfffa82b4736af55efcc051866696fe4d441bec419b454c1e7
 overlays: dir
 overlays/AmbientCueOverlay: dir
 overlays/AmbientCueOverlay/Android.bp: 1d197f1edf799e16ab7788bddc38254286b520466f6209b5d32aaf8d41913ea4
@@ -2354,7 +2354,7 @@ overlays/framework-res__frankel__auto_generated_rro_vendor/res/xml/irq_device_ma
 overlays/framework-res__frankel__auto_generated_rro_vendor/res/xml/power_profile.xml: 87081aaec17d244c6bb162167e28e4d87bb4559bd3df1291cc28d0aaee20ff6a
 overlays/overlay-modules.txt: d58aaa8c0967c170dacc1f4189d5dbd0e13e87d900331212dccd53672bdec7ce
 proprietary: dir
-proprietary/Android.bp: 17ea6450344687b8d1ea736f44a052d7097809812fb291ece0c45908f7e8e43b
+proprietary/Android.bp: 5334332acc66949ee6f0d5af25b81b84d5b60c7ebc562117fd0e040c2f3b6e60
 proprietary/linker.config-vendor.json: 8d2bf5bd2dd2946cfbdd6c00645b637342de3946abae68fb6c97350fda82a8e5
 proprietary/product: dir
 proprietary/product/etc: dir
@@ -3128,7 +3128,7 @@ proprietary/vendor/bin/hw/android.hardware.input.processor-service: f7c353f55f7e
 proprietary/vendor/bin/hw/android.hardware.memtrack-service.pixel: bb052b9851b35d509f6db20589f4bab0830d7e15a73abad618690d58deb7dfb6
 proprietary/vendor/bin/hw/android.hardware.neuralnetworks@service-darwinn-aidl: d6b55d9996e7264b49a66ced195e33fc962720c57e8df187e24a0b6a54d5d796
 proprietary/vendor/bin/hw/android.hardware.oemlock-service.citadel: 617d322dcd769c8fa9bd87632fdc8d85ed4c25dae082f1cc5d8d009613367f44
-proprietary/vendor/bin/hw/android.hardware.power-service.pixel-libperfmgr: 2273d3f823e42a9b1cda9b1465881dbb09250a1d46cc1b0d170094d4b79e6a1e
+proprietary/vendor/bin/hw/android.hardware.power-service.pixel-libperfmgr: ecbd7b1ef8efce3db6c05417e696a2786ba4ee93f5a2934afa5a3eecf2c82ce6
 proprietary/vendor/bin/hw/android.hardware.power.stats-service.pixel: 7755392983ea1727881199108ecce036d28bf2d1863649363a58089c37bcfe28
 proprietary/vendor/bin/hw/android.hardware.secure_element-service.uicc: e8134229d6f0045bb9199d96592541c1f28a5a5d51bb341052da755ddce8c3d7
 proprietary/vendor/bin/hw/android.hardware.security.keymint-service.citadel: 9327639f7ac99bc7eb8f4c966cfafe3e381a05f31f259034d285fda591a40619
@@ -3156,8 +3156,8 @@ proprietary/vendor/bin/hw/vendor.dolby.media.c2@1.0-service: 34ad8e2e8a1a81e92f7
 proprietary/vendor/bin/hw/vendor.google.aam-service: a3b99556f33a90e81e290db4aa1c40f6a59236c9868c8ac517342dd379c0b277
 proprietary/vendor/bin/hw/vendor.google.ambience_hub-service: 973545960fc9ee36bf2eb1b7effb5b25e286e67c7e822723ecdb0bf80d8bf6dc
 proprietary/vendor/bin/hw/vendor.google.edgetpu_vendor_service@1.0-service: 9b5c56368cd0493fc8e9edb8d19b1cf95dbb8dc03742d5cee37046d672c16893
-proprietary/vendor/bin/hw/vendor.google.google_battery-service: bf7cbdd037cec2082a5d7a9e312c6658f37cc10d5704f89cec35fa957b5d79b0
-proprietary/vendor/bin/hw/vendor.google.google_battery.ekf.service: 87d71f11374a4fee701d45a08642a3fca06a80f5cce0262e99b385cc6273da99
+proprietary/vendor/bin/hw/vendor.google.google_battery-service: a35d66d4eb3d9b7af890d0e805d689872873910be9f916871bfe65ea36f30327
+proprietary/vendor/bin/hw/vendor.google.google_battery.ekf.service: ab34437b8189eed637f3a52eea66edd200c8a61ec0b00eff0dba5d6c835be219
 proprietary/vendor/bin/hw/vendor.google.plat_security-service: d2ee6278eb3d824e270273b817723cd049c3bce56a6d8eb208eea6f9946eeded
 proprietary/vendor/bin/hw/vendor.google.radioext@1.0-service: 7ba7ddf0f1f43b0ec253b89ac8422934c22de30d5cbc9a29d75d6dc347c86eeb
 proprietary/vendor/bin/hw/vendor.google.wireless_charger-default: 8db32152df691da70333bb8ee974937af1ab8afbf213e272ff84018dfc98922b
@@ -3173,7 +3173,7 @@ proprietary/vendor/bin/mosey_server: fbfee9abc51d3a0c0686a13f9e17247414ed727d14a
 proprietary/vendor/bin/pcie_power_control: cfaa62ad3fc3247c1b0fefd96db0a557070b835fd2dabea7430cf32052193c29
 proprietary/vendor/bin/pixel-experiments-recovery.sh: 82ef9fa667e65eb7bbf2030aac54ca685eb44466ed33ce251321c45a45a2bcda
 proprietary/vendor/bin/pixel_irq_load_balancer: 637cd5910c9417acf5287c33ec2355c38b753f019ce78741f9c07aa13c5e66dc
-proprietary/vendor/bin/pixelstats-vendor: a926589fef82cbe49c7a92ccb649b7a71ad850fc94e8ebf924b8fcb74409c49d
+proprietary/vendor/bin/pixelstats-vendor: 367c6ee6d8fdf83d6f119020dc59068438d7fd3294fababf70c4ff0ea140a389
 proprietary/vendor/bin/predump_touch.sh: 153c0625e2d262e4f8973915b32ade9fd9e197148f0586dbfdc1ebc53e7e0366
 proprietary/vendor/bin/pvrhwperfd: 13bab94a5303cf2df36a7eddee512d27ff8b3a24d03e4bbcc66c9700c57b8674
 proprietary/vendor/bin/rebalance_interrupts-vendor: 62e442f9d929d06dad5810c54b86f0837330723b6df8760cf06fedd1ed8456ad
@@ -3484,7 +3484,7 @@ proprietary/vendor/etc/init/hostapd.android.rc: a09021175637f73d790f1015b849e3a6
 proprietary/vendor/etc/init/hw: dir
 proprietary/vendor/etc/init/hw/init.efs.rc: 0548cc00099c183948381cbbb611e014fe5a23c70cc04b6eb148c5315ea1a15a
 proprietary/vendor/etc/init/hw/init.frankel.rc: 521aa4ee4d8aea2a6a1ec001ed65ea9dfd5ed56b1375e53cb5e2d31b6a97c1ca
-proprietary/vendor/etc/init/hw/init.laguna.rc: b2544e7442a367c15e7799376e905037c0053145ff6dfcd8f174ea9dc067cf21
+proprietary/vendor/etc/init/hw/init.laguna.rc: 93f137c9c5c34e863691f22726ea64de2c855b626c2698f11a8104e88c5f9859
 proprietary/vendor/etc/init/hw/init.laguna.usb.rc: 6a9fbca25ab20c8f4cb5cb9ee2a04dc7b9fb0b8e6a3477ffd8be0d23653db458
 proprietary/vendor/etc/init/hw/init.persist.rc: 6065d8794876c77ac56246b8533561c3adfaabe3dec10d397ebe32f442416088
 proprietary/vendor/etc/init/init.aoc.rc: fbb768e18e950c9b96f2aa5110cfb673898e2e7b154af197736ddbe45909b879
@@ -3515,13 +3515,14 @@ proprietary/vendor/etc/init/libg3a_ghawb.rc: a89584a12ddd9c63fab8e63d312c811ca35
 proprietary/vendor/etc/init/memtrack.rc: c32b9eab16fbe57816e8672a02cb08ac68ccf90c28ab32135b80dc9512fb5dd4
 proprietary/vendor/etc/init/mosey.rc: 610bfff12609ab93d2eb7fdab84fccf24861e65d9e7b3a84629d24f77245f727
 proprietary/vendor/etc/init/pcie_power.rc: 52ef7306b1251e395958da6a4deb41192c26dd4aa92ca06f2e1b4346afd08881
+proprietary/vendor/etc/init/pixel-bgtasks-experiment.rc: 625697146738f6f795b0bd2fecc9f2e8db0642a06fb27bd40e8cab42e01757e5
 proprietary/vendor/etc/init/pixel-experiments-recovery.rc: 6867dcf1d5dc2eb30f9d1204f9c23052c25a5c5eb72b8d9325df1c230134f41d
 proprietary/vendor/etc/init/pixel-gnss-default.rc: 7eac3bbf4f5a1adffad4a1c4a5180fa4950e746b161ebc31cdd06fc217014781
 proprietary/vendor/etc/init/pixel-mm-gki.rc: 44373966ed3217974c377e106787280a065a4547ebf7ed47c12f2a13b969766f
 proprietary/vendor/etc/init/pixel-thermal-symlinks.rc: a8cb65590b1f74e29c4983978d9421074606b8a1ba13ba09d0b4f0f43ddde8ec
 proprietary/vendor/etc/init/pixel-ubp-experiment.rc: 8b41a7b0bea90343ed824d42bc91b0e7f114c9348e4bce2c606f9a642de269c1
 proprietary/vendor/etc/init/pixel.gralloc.allocator-V2-service.rc: fdcee85a508657b4f6406449a6a74e6fa64d80e7e4b262e887781b70130a8326
-proprietary/vendor/etc/init/pixelstats-vendor.laguna.rc: 84b27752dd5f296db87919d1f61ddfcfa3826d64740ef875ab3eac0fef26f6a2
+proprietary/vendor/etc/init/pixelstats-vendor.laguna.rc: 25b2b2ffa90c0670d4922fd48fcb302a2e5237ef5f98d02173dcce00124d138f
 proprietary/vendor/etc/init/pktrouter.rc: 8b3aacd550bdbab4c2b3897145bd866fb6a472867006b673f52ae3c29c7f67d5
 proprietary/vendor/etc/init/qfp-daemon.rc: dc38fca9a19b37cbb795fae4a497d5c51610209626f3362438162ac9c88b7c0e
 proprietary/vendor/etc/init/rebalance_interrupts-vendor.gs101.rc: 156312a4b8667b8b6401c0371bdc6384b186219e5106f5b33e6b854c22ef7668
@@ -3535,7 +3536,7 @@ proprietary/vendor/etc/init/vendor.google.aam.rc: f4e184b3c444dd663e7a30c27b8cb4
 proprietary/vendor/etc/init/vendor.google.ambience_hub-default.rc: 1a689294a792dac010819f7052a9ef4b15825e733a1fadcb2af844dea49aa456
 proprietary/vendor/etc/init/vendor.google.battery_mitigation-default.rc: 460c8df5ebd8b116f778ca7a7d69ed2cd7190cdab40b12599af390a35dcd9ac0
 proprietary/vendor/etc/init/vendor.google.edgetpu_vendor_service@1.0-service.rc: 145a79e37a278bd8e251b1261f9f361efd72ce1451135898dcdc552b275d49c7
-proprietary/vendor/etc/init/vendor.google.google_battery-default.rc: 74a3d3cc6af6bcfa39b093ffd8eb2be5d39c96f00a7c4b23a782d50c9198671b
+proprietary/vendor/etc/init/vendor.google.google_battery-default.rc: 8fbd37a50e1df34ead209f87948aeba3b102e45d7a4cb40272fd5b1a76cdbf70
 proprietary/vendor/etc/init/vendor.google.google_battery.ekf-default.rc: 4c8c840cb4926a789b5038936970ab3d2c25e020966b0efb720f383f0565be75
 proprietary/vendor/etc/init/vendor.google.modem_ml_svc_sit.rc: bc13061d7c8b5fcb7942ea0f29e3cfbc204f84bc3013fb1ccfbdd6fb9696c6a6
 proprietary/vendor/etc/init/vendor.google.plat_security-service.rc: 8651367b7fa2ce1012ec830e61d856c91620cd9e20382dd36ee67e801ffbbde1
@@ -3569,8 +3570,8 @@ proprietary/vendor/etc/modem_stat.conf: d8a9b8181f35f3537a0b60994b758d166596c147
 proprietary/vendor/etc/open_carrier_info.dat: 3704b6d7e0f9fe8c792d68dbb75c4001d26137cf4edf6f1f7d51c26175867a8f
 proprietary/vendor/etc/panel_config_google-flea_cal0.pb: bae711243e89bddd0e2308f4302cadd26e3081c3f4629518c3b68a4718a769a7
 proprietary/vendor/etc/panel_config_google-fleb_cal0.pb: c9d0fb0cf24ea0271f8e9a2d5f28858a3235be3aa9c171218495a99262c71832
-proprietary/vendor/etc/pixelstats_config.json: 4115cbeeffe38730cf09f32df1c4127601c7f4014f5fc07fd23072fb71f7c28d
-proprietary/vendor/etc/powerhint.json: 3a45f682153ac182463fc9c7b4970bf8072d94b8473ad5aa594829d02ab3f391
+proprietary/vendor/etc/pixelstats_config.json: 626179e230507484f27cafd2611ec33b30c7f695240614ecd62221a8147b38a0
+proprietary/vendor/etc/powerhint.json: 7ffa59c904ef254bd21c0f8fbf4b44c1b15c8e168c1efa146370c43c44b20748
 proprietary/vendor/etc/powervr.ini: 90a42e7fa6983287dde8c4af39cb8c8ff6f997d0f333e1a279fb02864acb627e
 proprietary/vendor/etc/public.libraries.txt: c094291bff1c4b4495a3d3695c3b6ad87cd2908e8d091d483abc2e8bf300e857
 proprietary/vendor/etc/res: dir
@@ -3599,12 +3600,14 @@ proprietary/vendor/etc/task_profiles.json: f4792fdcb3878659aa8117327c546a0fc5488
 proprietary/vendor/etc/telephony: dir
 proprietary/vendor/etc/telephony/satellite_access_config.json: b5f13c8cd7d582d0c9c204e447201ce4c6ed5f42cb72337683fdf13bc12bc7bf
 proprietary/vendor/etc/telephony/sats2.dat: a5af86cc0c241a931ccd01d2c0f8b4a58aa252632a55064a7aaa750e6f88bf13
-proprietary/vendor/etc/thermal_info_config.json: b26c535220e0fe33e4df4a3cba89f52d9f43151b9997fda65fc647947ec19b1f
+proprietary/vendor/etc/thermal_info_config.json: 21dc5c7268944fc1868ec7e420a159a0475abf161607fa1af0d56be2243af155
 proprietary/vendor/etc/thermal_info_config_charge.json: 1df84afdb951647df5a7433a507bfc2e08ebc9e753ac14efb117783fc1d904b2
-proprietary/vendor/etc/thermal_info_config_stats.json: 25a5aabdac74f6eb79dd29467f48f208a5652ef14640a77a595dc2dd451af7cc
-proprietary/vendor/etc/thermal_info_config_throttling.json: 8b58f6c1107fe1433db4d0345154a14c71996b8ba014b95d628f3351b38f145a
+proprietary/vendor/etc/thermal_info_config_earlywarnings.json: b3bdaca7abe12e278cb90a71b804dfc726057bf6c8db5a8810b303c2a818835b
+proprietary/vendor/etc/thermal_info_config_lpm.json: 6c56126c13992eb4dd2e94353eacac736c6f73c42d35f39ee9f7d073336808f8
+proprietary/vendor/etc/thermal_info_config_stats.json: 0d77a20c3885465f4fe71ff2fc5f30162aaf804609df0947cec319c27028e0fb
+proprietary/vendor/etc/thermal_info_config_throttling.json: d58d5aa39e2189073c520ae67420008aff2e790915f16bfa87825603d9077140
 proprietary/vendor/etc/thermal_info_config_vt.json: dcb48a251d2718243d70c407e3f564100d29a9ded407455062e89436599a701a
-proprietary/vendor/etc/thermal_info_config_wingboard.json: 317fcfa01c84d1e082ad946e3f01de2e2f1b0e0b010228f56ed7d9129754234d
+proprietary/vendor/etc/thermal_info_config_wingboard.json: 34a63a2e41692b2268900e028391fa692f86ea8109bc65aa67891d1223d7afb0
 proprietary/vendor/etc/touchflow.pb: 96deaa3c6c09af7f26490f743179aa7fb8a2a3a7f344cae51904c4859894bffe
 proprietary/vendor/etc/twoshay_config.json: 0429d8ecda8f458f0f3c707a046ad836cec20871df15e1cb4b321c8e26e33166
 proprietary/vendor/etc/ueventd.rc: 74ca39a3cb30fca454a147cbaaef6f4ce5288bef18a8c6aea35f238d99e6f893
@@ -6521,10 +6524,10 @@ proprietary/vendor/lib64/libnos_transport.so: 57de206f40b6ed9841bbfaacaf441ff904
 proprietary/vendor/lib64/libnosprotos.so: 537f38b0cdfc2b1b6e4113e8f5341c9f6ec1d6168c99244541948f1aad6be995
 proprietary/vendor/lib64/liboemcrypto.so: 044ecd5337215475428e9cc112356f90d6ed9e0e3b6c690a21f20418246f3bfe
 proprietary/vendor/lib64/liboemservice.so: 0a9c28f9c586956a15b28640c3d45f8876d68ff8825918583534cbccc792550d
-proprietary/vendor/lib64/libperfmgr.so: a92ca32c238d02b181575ee04053dbc60d7cdc3f1ccb43a9545ceba7152b7053
-proprietary/vendor/lib64/libpixelatoms_defs.so: bf3c49f9e7ef30ffc5fd43bd2b7429e95877e2182f01e47306cd209c0ddfeca5
+proprietary/vendor/lib64/libperfmgr.so: 4fa20f9fb81ef7b718105ee9b2ea3d6bad3698bc87601e282e65df14b71a33c1
+proprietary/vendor/lib64/libpixelatoms_defs.so: 48f124a67101f9b76422372cb77983202de19534e926e23b5ccd01fb5842d9e3
 proprietary/vendor/lib64/libpixelhealth.so: 729eabed07f0a2d545643854ce11b6c41c8e02fe143b97715e94af384c957c62
-proprietary/vendor/lib64/libpixelstats.so: cff3d6cdf1a3eb7ccb84dd45bd1a2cbc80b090d8f7e7347f3048895470f6b4d2
+proprietary/vendor/lib64/libpixelstats.so: a5b73fc28bdfc93d712295872857d66832bb5a2308645a93d68ae2c7f9c16e6c
 proprietary/vendor/lib64/libprotobuf-cpp-full-6.33.1.so: 7fdedeb80d9fa171eef04cbe1f7657dcddf46d36acf7eee9bb78820af189fb96
 proprietary/vendor/lib64/libprotobuf-cpp-lite-6.33.1.so: 1a5f05c5ffb76931735c0c38979d3a67b690bd088e05d8f45d448debbcc84f89
 proprietary/vendor/lib64/libqfp-service.so: cc9bf00ffbafdd40aec181b87d4e198a519ebfc1ac271617b85f644f4d2ee407
@@ -6568,9 +6571,10 @@ proprietary/vendor/lib64/modemml-tflite-service-aidl-V1-ndk.so: 1ae60aae45d38bac
 proprietary/vendor/lib64/nos_app_avb.so: edfc3c830b130765972929b9ffc3bcc394f7e340b0991fbe64732d9f081e2bbb
 proprietary/vendor/lib64/nos_app_keymaster.so: d9e45a70cbfb1a405b048a1366df96e505071ffbb07871b1eb1fd2e5187299ba
 proprietary/vendor/lib64/nos_app_weaver.so: 63ce1b1e9c13194ffb489788034b21ee072f3536d1fd6afb2fc5bb5eee04df2a
-proprietary/vendor/lib64/pixel-power-ext-V1-ndk.so: 76277a94f25aae9adc48852dce84443f087f5ecf5d124addb2955475310e9912
+proprietary/vendor/lib64/pixel-power-ext-V1-ndk.so: e0751ac492b3a1961833196812058ceaaea6ad103e2c19f35dc06422a0235f61
+proprietary/vendor/lib64/pixel-power-ext-V2-ndk.so: f7309ffda361bb88d5d27a6b45b1b31232f73e3b89d1cce0a018e467557ca376
 proprietary/vendor/lib64/pixel_stateresidency_provider_aidl_interface-ndk.so: a72e50e826432a371a3729fdfbb1f9cf6ef27759bfe8a6c297ab37d15ca9d600
-proprietary/vendor/lib64/pixelatoms-cpp.so: e9038aac254a859d91bb86cf86d50e1813570ef4ac1763fc8d65d0ce782b87c8
+proprietary/vendor/lib64/pixelatoms-cpp.so: 9cf6b2866da556c306a47ed0018a8a6bf31a9116391d1c2b69a566fd95ad498b
 proprietary/vendor/lib64/pixelpowerstats_provider_aidl_interface-cpp.so: e91ed340e63dfd9233703634e1061a5563d8cb4fdbfe7bb5130a6fb80876ee0a
 proprietary/vendor/lib64/sensors.usf.so: d060c52f58a5299c5f055a0707af76d9136e77370b368a55270f39d0b825dce6
 proprietary/vendor/lib64/soundfx: dir
diff --git a/vendor-specs/google_devices/mustang.yml b/vendor-specs/google_devices/mustang.yml
index 615a24cf3..27469512e 100644
--- a/vendor-specs/google_devices/mustang.yml
+++ b/vendor-specs/google_devices/mustang.yml
@@ -33,7 +33,7 @@ firmware/gsa_fw.img: da9e2eab0bb98f574bf5008c88231c424c4b5316f2d806955b8c025acba
 firmware/modem.img: 4f054206715985f9db03df547193bc2a44115f3c699a99a27bc5b69697e1b248
 firmware/radio.img: a9d1296f3079798ef91d2173b99e4d9bfe469a2cc596328b13e057107b407503
 firmware/tzsw.img: 4efd78195ce6610cd133d202f631e66fe000bb0b479a48aa441ef1e14e0d07c6
-mustang.mk: c56656430c3798352d4cadf668fe062cfca00908633113aaadc2dbd2d8454240
+mustang.mk: 833e127b62b7cda9d69ffb0aa6925f87bda8e405d8db674e6cbfcd00795ce5db
 overlays: dir
 overlays/AmbientCueOverlay: dir
 overlays/AmbientCueOverlay/Android.bp: 1d197f1edf799e16ab7788bddc38254286b520466f6209b5d32aaf8d41913ea4
@@ -2373,7 +2373,7 @@ overlays/framework-res__mustang__auto_generated_rro_vendor/res/xml/irq_device_ma
 overlays/framework-res__mustang__auto_generated_rro_vendor/res/xml/power_profile.xml: 87081aaec17d244c6bb162167e28e4d87bb4559bd3df1291cc28d0aaee20ff6a
 overlays/overlay-modules.txt: f75e0b709dfdac450f891a85e320177db8b5e8eb8bd902f4a4dd83829b5fe988
 proprietary: dir
-proprietary/Android.bp: 87ebb84539b9124538a608d776e779e24a0ae624e6a39f3db912a7a7a59fb046
+proprietary/Android.bp: c0abd12f893817a908e9a51ce3ac173f3248877d320550ee76b699e1e8b78a12
 proprietary/linker.config-vendor.json: 8d2bf5bd2dd2946cfbdd6c00645b637342de3946abae68fb6c97350fda82a8e5
 proprietary/product: dir
 proprietary/product/etc: dir
@@ -3149,7 +3149,7 @@ proprietary/vendor/bin/hw/android.hardware.input.processor-service: f7c353f55f7e
 proprietary/vendor/bin/hw/android.hardware.memtrack-service.pixel: bb052b9851b35d509f6db20589f4bab0830d7e15a73abad618690d58deb7dfb6
 proprietary/vendor/bin/hw/android.hardware.neuralnetworks@service-darwinn-aidl: d6b55d9996e7264b49a66ced195e33fc962720c57e8df187e24a0b6a54d5d796
 proprietary/vendor/bin/hw/android.hardware.oemlock-service.citadel: 617d322dcd769c8fa9bd87632fdc8d85ed4c25dae082f1cc5d8d009613367f44
-proprietary/vendor/bin/hw/android.hardware.power-service.pixel-libperfmgr: 2273d3f823e42a9b1cda9b1465881dbb09250a1d46cc1b0d170094d4b79e6a1e
+proprietary/vendor/bin/hw/android.hardware.power-service.pixel-libperfmgr: ecbd7b1ef8efce3db6c05417e696a2786ba4ee93f5a2934afa5a3eecf2c82ce6
 proprietary/vendor/bin/hw/android.hardware.power.stats-service.pixel: 8da1317b265c2c8851161aea9d4fae731a46feef06aea359d3d3ce419fba199a
 proprietary/vendor/bin/hw/android.hardware.samsung.uwb-service: 3dc073de7d50c3045ad9e2562d3d20ba609758fce871a7c67d769f2c6a374cde
 proprietary/vendor/bin/hw/android.hardware.secure_element-service.uicc: e8134229d6f0045bb9199d96592541c1f28a5a5d51bb341052da755ddce8c3d7
@@ -3178,8 +3178,8 @@ proprietary/vendor/bin/hw/vendor.dolby.media.c2@1.0-service: 34ad8e2e8a1a81e92f7
 proprietary/vendor/bin/hw/vendor.google.aam-service: a3b99556f33a90e81e290db4aa1c40f6a59236c9868c8ac517342dd379c0b277
 proprietary/vendor/bin/hw/vendor.google.ambience_hub-service: 973545960fc9ee36bf2eb1b7effb5b25e286e67c7e822723ecdb0bf80d8bf6dc
 proprietary/vendor/bin/hw/vendor.google.edgetpu_vendor_service@1.0-service: 9b5c56368cd0493fc8e9edb8d19b1cf95dbb8dc03742d5cee37046d672c16893
-proprietary/vendor/bin/hw/vendor.google.google_battery-service: bf7cbdd037cec2082a5d7a9e312c6658f37cc10d5704f89cec35fa957b5d79b0
-proprietary/vendor/bin/hw/vendor.google.google_battery.ekf.service: 87d71f11374a4fee701d45a08642a3fca06a80f5cce0262e99b385cc6273da99
+proprietary/vendor/bin/hw/vendor.google.google_battery-service: a35d66d4eb3d9b7af890d0e805d689872873910be9f916871bfe65ea36f30327
+proprietary/vendor/bin/hw/vendor.google.google_battery.ekf.service: ab34437b8189eed637f3a52eea66edd200c8a61ec0b00eff0dba5d6c835be219
 proprietary/vendor/bin/hw/vendor.google.plat_security-service: d2ee6278eb3d824e270273b817723cd049c3bce56a6d8eb208eea6f9946eeded
 proprietary/vendor/bin/hw/vendor.google.radioext@1.0-service: 7ba7ddf0f1f43b0ec253b89ac8422934c22de30d5cbc9a29d75d6dc347c86eeb
 proprietary/vendor/bin/hw/vendor.google.wireless_charger-default: 8db32152df691da70333bb8ee974937af1ab8afbf213e272ff84018dfc98922b
@@ -3196,7 +3196,7 @@ proprietary/vendor/bin/mosey_server: fbfee9abc51d3a0c0686a13f9e17247414ed727d14a
 proprietary/vendor/bin/pcie_power_control: cfaa62ad3fc3247c1b0fefd96db0a557070b835fd2dabea7430cf32052193c29
 proprietary/vendor/bin/pixel-experiments-recovery.sh: 82ef9fa667e65eb7bbf2030aac54ca685eb44466ed33ce251321c45a45a2bcda
 proprietary/vendor/bin/pixel_irq_load_balancer: 637cd5910c9417acf5287c33ec2355c38b753f019ce78741f9c07aa13c5e66dc
-proprietary/vendor/bin/pixelstats-vendor: a926589fef82cbe49c7a92ccb649b7a71ad850fc94e8ebf924b8fcb74409c49d
+proprietary/vendor/bin/pixelstats-vendor: 367c6ee6d8fdf83d6f119020dc59068438d7fd3294fababf70c4ff0ea140a389
 proprietary/vendor/bin/predump_touch.sh: 153c0625e2d262e4f8973915b32ade9fd9e197148f0586dbfdc1ebc53e7e0366
 proprietary/vendor/bin/pvrhwperfd: 13bab94a5303cf2df36a7eddee512d27ff8b3a24d03e4bbcc66c9700c57b8674
 proprietary/vendor/bin/rebalance_interrupts-vendor: 62e442f9d929d06dad5810c54b86f0837330723b6df8760cf06fedd1ed8456ad
@@ -3492,7 +3492,7 @@ proprietary/vendor/etc/init/google.hardware.media.c2@3.0-service.rc: e52c1c80748
 proprietary/vendor/etc/init/hostapd.android.rc: a09021175637f73d790f1015b849e3a6c441dba05477fbcde33fa35ce64fb1b6
 proprietary/vendor/etc/init/hw: dir
 proprietary/vendor/etc/init/hw/init.efs.rc: 0548cc00099c183948381cbbb611e014fe5a23c70cc04b6eb148c5315ea1a15a
-proprietary/vendor/etc/init/hw/init.laguna.rc: b2544e7442a367c15e7799376e905037c0053145ff6dfcd8f174ea9dc067cf21
+proprietary/vendor/etc/init/hw/init.laguna.rc: 93f137c9c5c34e863691f22726ea64de2c855b626c2698f11a8104e88c5f9859
 proprietary/vendor/etc/init/hw/init.laguna.usb.rc: 6a9fbca25ab20c8f4cb5cb9ee2a04dc7b9fb0b8e6a3477ffd8be0d23653db458
 proprietary/vendor/etc/init/hw/init.mustang.rc: ae65de34166e503107101f57c5857c0ec8ca2b3d305f174c7cb53a536239a7b5
 proprietary/vendor/etc/init/hw/init.persist.rc: 6065d8794876c77ac56246b8533561c3adfaabe3dec10d397ebe32f442416088
@@ -3524,13 +3524,14 @@ proprietary/vendor/etc/init/libg3a_ghawb.rc: a89584a12ddd9c63fab8e63d312c811ca35
 proprietary/vendor/etc/init/memtrack.rc: c32b9eab16fbe57816e8672a02cb08ac68ccf90c28ab32135b80dc9512fb5dd4
 proprietary/vendor/etc/init/mosey.rc: 610bfff12609ab93d2eb7fdab84fccf24861e65d9e7b3a84629d24f77245f727
 proprietary/vendor/etc/init/pcie_power.rc: 52ef7306b1251e395958da6a4deb41192c26dd4aa92ca06f2e1b4346afd08881
+proprietary/vendor/etc/init/pixel-bgtasks-experiment.rc: 625697146738f6f795b0bd2fecc9f2e8db0642a06fb27bd40e8cab42e01757e5
 proprietary/vendor/etc/init/pixel-experiments-recovery.rc: 6867dcf1d5dc2eb30f9d1204f9c23052c25a5c5eb72b8d9325df1c230134f41d
 proprietary/vendor/etc/init/pixel-gnss-default.rc: 7eac3bbf4f5a1adffad4a1c4a5180fa4950e746b161ebc31cdd06fc217014781
 proprietary/vendor/etc/init/pixel-mm-gki.rc: 44373966ed3217974c377e106787280a065a4547ebf7ed47c12f2a13b969766f
 proprietary/vendor/etc/init/pixel-thermal-symlinks.rc: a8cb65590b1f74e29c4983978d9421074606b8a1ba13ba09d0b4f0f43ddde8ec
 proprietary/vendor/etc/init/pixel-ubp-experiment.rc: 8b41a7b0bea90343ed824d42bc91b0e7f114c9348e4bce2c606f9a642de269c1
 proprietary/vendor/etc/init/pixel.gralloc.allocator-V2-service.rc: fdcee85a508657b4f6406449a6a74e6fa64d80e7e4b262e887781b70130a8326
-proprietary/vendor/etc/init/pixelstats-vendor.laguna.rc: 84b27752dd5f296db87919d1f61ddfcfa3826d64740ef875ab3eac0fef26f6a2
+proprietary/vendor/etc/init/pixelstats-vendor.laguna.rc: 25b2b2ffa90c0670d4922fd48fcb302a2e5237ef5f98d02173dcce00124d138f
 proprietary/vendor/etc/init/pktrouter.rc: 8b3aacd550bdbab4c2b3897145bd866fb6a472867006b673f52ae3c29c7f67d5
 proprietary/vendor/etc/init/qfp-daemon.rc: dc38fca9a19b37cbb795fae4a497d5c51610209626f3362438162ac9c88b7c0e
 proprietary/vendor/etc/init/rebalance_interrupts-vendor.gs101.rc: 156312a4b8667b8b6401c0371bdc6384b186219e5106f5b33e6b854c22ef7668
@@ -3545,7 +3546,7 @@ proprietary/vendor/etc/init/vendor.google.aam.rc: f4e184b3c444dd663e7a30c27b8cb4
 proprietary/vendor/etc/init/vendor.google.ambience_hub-default.rc: 1a689294a792dac010819f7052a9ef4b15825e733a1fadcb2af844dea49aa456
 proprietary/vendor/etc/init/vendor.google.battery_mitigation-default.rc: 460c8df5ebd8b116f778ca7a7d69ed2cd7190cdab40b12599af390a35dcd9ac0
 proprietary/vendor/etc/init/vendor.google.edgetpu_vendor_service@1.0-service.rc: 145a79e37a278bd8e251b1261f9f361efd72ce1451135898dcdc552b275d49c7
-proprietary/vendor/etc/init/vendor.google.google_battery-default.rc: 74a3d3cc6af6bcfa39b093ffd8eb2be5d39c96f00a7c4b23a782d50c9198671b
+proprietary/vendor/etc/init/vendor.google.google_battery-default.rc: 8fbd37a50e1df34ead209f87948aeba3b102e45d7a4cb40272fd5b1a76cdbf70
 proprietary/vendor/etc/init/vendor.google.google_battery.ekf-default.rc: 4c8c840cb4926a789b5038936970ab3d2c25e020966b0efb720f383f0565be75
 proprietary/vendor/etc/init/vendor.google.modem_ml_svc_sit.rc: bc13061d7c8b5fcb7942ea0f29e3cfbc204f84bc3013fb1ccfbdd6fb9696c6a6
 proprietary/vendor/etc/init/vendor.google.plat_security-service.rc: 8651367b7fa2ce1012ec830e61d856c91620cd9e20382dd36ee67e801ffbbde1
@@ -3580,8 +3581,8 @@ proprietary/vendor/etc/modem_stat.conf: d8a9b8181f35f3537a0b60994b758d166596c147
 proprietary/vendor/etc/open_carrier_info.dat: 3704b6d7e0f9fe8c792d68dbb75c4001d26137cf4edf6f1f7d51c26175867a8f
 proprietary/vendor/etc/panel_config_google-mtea_cal0.pb: a2cbcaeae1de6f8536f0902ef824374bc7210d0426db1447239e55627acd0bca
 proprietary/vendor/etc/panel_ctrl_google-mtea_cal0.pb: b7efd6362325b63923a0b73f731eac0a257887c3cd557953b4568e9567bcd1a3
-proprietary/vendor/etc/pixelstats_config.json: 4115cbeeffe38730cf09f32df1c4127601c7f4014f5fc07fd23072fb71f7c28d
-proprietary/vendor/etc/powerhint.json: e57cc78c535f9964ebabd26dc84dc635f76fb6260aa2e8c74079e872fafb77ab
+proprietary/vendor/etc/pixelstats_config.json: 626179e230507484f27cafd2611ec33b30c7f695240614ecd62221a8147b38a0
+proprietary/vendor/etc/powerhint.json: 49c6f842598de587654b6d40133356ed6368df17a9fe34bb9b82feeeb0528036
 proprietary/vendor/etc/powervr.ini: 90a42e7fa6983287dde8c4af39cb8c8ff6f997d0f333e1a279fb02864acb627e
 proprietary/vendor/etc/public.libraries.txt: c094291bff1c4b4495a3d3695c3b6ad87cd2908e8d091d483abc2e8bf300e857
 proprietary/vendor/etc/res: dir
@@ -3611,12 +3612,14 @@ proprietary/vendor/etc/tcm_test_cfg.ini: 62d9b9b18aa9776139d40266645821e82ebda08
 proprietary/vendor/etc/telephony: dir
 proprietary/vendor/etc/telephony/satellite_access_config.json: b5f13c8cd7d582d0c9c204e447201ce4c6ed5f42cb72337683fdf13bc12bc7bf
 proprietary/vendor/etc/telephony/sats2.dat: a5af86cc0c241a931ccd01d2c0f8b4a58aa252632a55064a7aaa750e6f88bf13
-proprietary/vendor/etc/thermal_info_config.json: 232d0a5d24c4b18dc57bacb102baad392fc8f755d88a560a59d289fba19feaae
+proprietary/vendor/etc/thermal_info_config.json: 9976306c6421447426f17464a12a3d058eee6e4c936e6a1db7dceb9280c0286d
 proprietary/vendor/etc/thermal_info_config_charge.json: 2d5d10a5ab2eae1443ea6200569c316cbf0109c407a16672386c0e0095bf8532
-proprietary/vendor/etc/thermal_info_config_stats.json: 25a5aabdac74f6eb79dd29467f48f208a5652ef14640a77a595dc2dd451af7cc
-proprietary/vendor/etc/thermal_info_config_throttling.json: 8b58f6c1107fe1433db4d0345154a14c71996b8ba014b95d628f3351b38f145a
+proprietary/vendor/etc/thermal_info_config_earlywarnings.json: b3bdaca7abe12e278cb90a71b804dfc726057bf6c8db5a8810b303c2a818835b
+proprietary/vendor/etc/thermal_info_config_lpm.json: 6c56126c13992eb4dd2e94353eacac736c6f73c42d35f39ee9f7d073336808f8
+proprietary/vendor/etc/thermal_info_config_stats.json: 0d77a20c3885465f4fe71ff2fc5f30162aaf804609df0947cec319c27028e0fb
+proprietary/vendor/etc/thermal_info_config_throttling.json: d58d5aa39e2189073c520ae67420008aff2e790915f16bfa87825603d9077140
 proprietary/vendor/etc/thermal_info_config_vt.json: dcb48a251d2718243d70c407e3f564100d29a9ded407455062e89436599a701a
-proprietary/vendor/etc/thermal_info_config_wingboard.json: 317fcfa01c84d1e082ad946e3f01de2e2f1b0e0b010228f56ed7d9129754234d
+proprietary/vendor/etc/thermal_info_config_wingboard.json: 34a63a2e41692b2268900e028391fa692f86ea8109bc65aa67891d1223d7afb0
 proprietary/vendor/etc/thread_power_limits.csv: 20498f3478b5822e4fd17a4caa221f9105ccc45d64d33a9eb1e80e4073e2646b
 proprietary/vendor/etc/thread_power_limits_CA.csv: f0bdea6a2d1ef0d0a636aaf72a1f6bd8880dc674b60b3babab2d6f97f26bfb34
 proprietary/vendor/etc/thread_power_limits_EU.csv: 20498f3478b5822e4fd17a4caa221f9105ccc45d64d33a9eb1e80e4073e2646b
@@ -6555,10 +6558,10 @@ proprietary/vendor/lib64/libnos_transport.so: 57de206f40b6ed9841bbfaacaf441ff904
 proprietary/vendor/lib64/libnosprotos.so: 537f38b0cdfc2b1b6e4113e8f5341c9f6ec1d6168c99244541948f1aad6be995
 proprietary/vendor/lib64/liboemcrypto.so: 044ecd5337215475428e9cc112356f90d6ed9e0e3b6c690a21f20418246f3bfe
 proprietary/vendor/lib64/liboemservice.so: 0a9c28f9c586956a15b28640c3d45f8876d68ff8825918583534cbccc792550d
-proprietary/vendor/lib64/libperfmgr.so: a92ca32c238d02b181575ee04053dbc60d7cdc3f1ccb43a9545ceba7152b7053
-proprietary/vendor/lib64/libpixelatoms_defs.so: bf3c49f9e7ef30ffc5fd43bd2b7429e95877e2182f01e47306cd209c0ddfeca5
+proprietary/vendor/lib64/libperfmgr.so: 4fa20f9fb81ef7b718105ee9b2ea3d6bad3698bc87601e282e65df14b71a33c1
+proprietary/vendor/lib64/libpixelatoms_defs.so: 48f124a67101f9b76422372cb77983202de19534e926e23b5ccd01fb5842d9e3
 proprietary/vendor/lib64/libpixelhealth.so: 729eabed07f0a2d545643854ce11b6c41c8e02fe143b97715e94af384c957c62
-proprietary/vendor/lib64/libpixelstats.so: cff3d6cdf1a3eb7ccb84dd45bd1a2cbc80b090d8f7e7347f3048895470f6b4d2
+proprietary/vendor/lib64/libpixelstats.so: a5b73fc28bdfc93d712295872857d66832bb5a2308645a93d68ae2c7f9c16e6c
 proprietary/vendor/lib64/libprotobuf-cpp-full-6.33.1.so: 7fdedeb80d9fa171eef04cbe1f7657dcddf46d36acf7eee9bb78820af189fb96
 proprietary/vendor/lib64/libprotobuf-cpp-lite-6.33.1.so: 1a5f05c5ffb76931735c0c38979d3a67b690bd088e05d8f45d448debbcc84f89
 proprietary/vendor/lib64/libqfp-service.so: cc9bf00ffbafdd40aec181b87d4e198a519ebfc1ac271617b85f644f4d2ee407
@@ -6602,9 +6605,10 @@ proprietary/vendor/lib64/modemml-tflite-service-aidl-V1-ndk.so: 1ae60aae45d38bac
 proprietary/vendor/lib64/nos_app_avb.so: edfc3c830b130765972929b9ffc3bcc394f7e340b0991fbe64732d9f081e2bbb
 proprietary/vendor/lib64/nos_app_keymaster.so: d9e45a70cbfb1a405b048a1366df96e505071ffbb07871b1eb1fd2e5187299ba
 proprietary/vendor/lib64/nos_app_weaver.so: 63ce1b1e9c13194ffb489788034b21ee072f3536d1fd6afb2fc5bb5eee04df2a
-proprietary/vendor/lib64/pixel-power-ext-V1-ndk.so: 76277a94f25aae9adc48852dce84443f087f5ecf5d124addb2955475310e9912
+proprietary/vendor/lib64/pixel-power-ext-V1-ndk.so: e0751ac492b3a1961833196812058ceaaea6ad103e2c19f35dc06422a0235f61
+proprietary/vendor/lib64/pixel-power-ext-V2-ndk.so: f7309ffda361bb88d5d27a6b45b1b31232f73e3b89d1cce0a018e467557ca376
 proprietary/vendor/lib64/pixel_stateresidency_provider_aidl_interface-ndk.so: a72e50e826432a371a3729fdfbb1f9cf6ef27759bfe8a6c297ab37d15ca9d600
-proprietary/vendor/lib64/pixelatoms-cpp.so: e9038aac254a859d91bb86cf86d50e1813570ef4ac1763fc8d65d0ce782b87c8
+proprietary/vendor/lib64/pixelatoms-cpp.so: 9cf6b2866da556c306a47ed0018a8a6bf31a9116391d1c2b69a566fd95ad498b
 proprietary/vendor/lib64/pixelpowerstats_provider_aidl_interface-cpp.so: e91ed340e63dfd9233703634e1061a5563d8cb4fdbfe7bb5130a6fb80876ee0a
 proprietary/vendor/lib64/sensors.usf.so: c72b1314d692ef7adc97d078598cd978bbd026d14df43cc0fb42a96a781e3086
 proprietary/vendor/lib64/soundfx: dir
diff --git a/vendor-specs/google_devices/rango.yml b/vendor-specs/google_devices/rango.yml
index 890f100b2..8480b4b7e 100644
--- a/vendor-specs/google_devices/rango.yml
+++ b/vendor-specs/google_devices/rango.yml
@@ -2630,7 +2630,7 @@ proprietary-root-soong-ns/Android.bp: 41a0674490c2102d427527c6f9f3ab49b94f2ab45d
 proprietary-root-soong-ns/system_ext: dir
 proprietary-root-soong-ns/system_ext/framework: dir
 proprietary-root-soong-ns/system_ext/framework/rango-services.jar: 9127e7538aa0e6ad47b6def5fe296b9aa483e49afda028022929ec0ebb1f20e4
-proprietary/Android.bp: 6de876f1e98e350ec58a51b90e419dc72a447410a0adb1006a5c898dbf36128a
+proprietary/Android.bp: 0bb770f485dc9ae38afdea1eb24834a65f614b0ad730587b4b8bf22a541aaf63
 proprietary/linker.config-vendor.json: 8d2bf5bd2dd2946cfbdd6c00645b637342de3946abae68fb6c97350fda82a8e5
 proprietary/product: dir
 proprietary/product/etc: dir
@@ -3409,7 +3409,7 @@ proprietary/vendor/bin/hw/android.hardware.input.processor-service: f7c353f55f7e
 proprietary/vendor/bin/hw/android.hardware.memtrack-service.pixel: bb052b9851b35d509f6db20589f4bab0830d7e15a73abad618690d58deb7dfb6
 proprietary/vendor/bin/hw/android.hardware.neuralnetworks@service-darwinn-aidl: d6b55d9996e7264b49a66ced195e33fc962720c57e8df187e24a0b6a54d5d796
 proprietary/vendor/bin/hw/android.hardware.oemlock-service.citadel: 617d322dcd769c8fa9bd87632fdc8d85ed4c25dae082f1cc5d8d009613367f44
-proprietary/vendor/bin/hw/android.hardware.power-service.pixel-libperfmgr: 2273d3f823e42a9b1cda9b1465881dbb09250a1d46cc1b0d170094d4b79e6a1e
+proprietary/vendor/bin/hw/android.hardware.power-service.pixel-libperfmgr: ecbd7b1ef8efce3db6c05417e696a2786ba4ee93f5a2934afa5a3eecf2c82ce6
 proprietary/vendor/bin/hw/android.hardware.power.stats-service.pixel: 37e99ff38f4d60da7726499d61204d14b70b30522580b0b7a951ae589b4b909c
 proprietary/vendor/bin/hw/android.hardware.samsung.uwb-service: 3dc073de7d50c3045ad9e2562d3d20ba609758fce871a7c67d769f2c6a374cde
 proprietary/vendor/bin/hw/android.hardware.secure_element-service.uicc: e8134229d6f0045bb9199d96592541c1f28a5a5d51bb341052da755ddce8c3d7
@@ -3437,7 +3437,7 @@ proprietary/vendor/bin/hw/vendor.dolby.media.c2@1.0-service: 34ad8e2e8a1a81e92f7
 proprietary/vendor/bin/hw/vendor.google.aam-service: a3b99556f33a90e81e290db4aa1c40f6a59236c9868c8ac517342dd379c0b277
 proprietary/vendor/bin/hw/vendor.google.ambience_hub-service: 973545960fc9ee36bf2eb1b7effb5b25e286e67c7e822723ecdb0bf80d8bf6dc
 proprietary/vendor/bin/hw/vendor.google.edgetpu_vendor_service@1.0-service: 9b5c56368cd0493fc8e9edb8d19b1cf95dbb8dc03742d5cee37046d672c16893
-proprietary/vendor/bin/hw/vendor.google.google_battery-service: bf7cbdd037cec2082a5d7a9e312c6658f37cc10d5704f89cec35fa957b5d79b0
+proprietary/vendor/bin/hw/vendor.google.google_battery-service: a35d66d4eb3d9b7af890d0e805d689872873910be9f916871bfe65ea36f30327
 proprietary/vendor/bin/hw/vendor.google.plat_security-service: d2ee6278eb3d824e270273b817723cd049c3bce56a6d8eb208eea6f9946eeded
 proprietary/vendor/bin/hw/vendor.google.radioext@1.0-service: 7ba7ddf0f1f43b0ec253b89ac8422934c22de30d5cbc9a29d75d6dc347c86eeb
 proprietary/vendor/bin/hw/vendor.google.wireless_charger-default: 8db32152df691da70333bb8ee974937af1ab8afbf213e272ff84018dfc98922b
@@ -3454,7 +3454,7 @@ proprietary/vendor/bin/mosey_server: fbfee9abc51d3a0c0686a13f9e17247414ed727d14a
 proprietary/vendor/bin/pcie_power_control: cfaa62ad3fc3247c1b0fefd96db0a557070b835fd2dabea7430cf32052193c29
 proprietary/vendor/bin/pixel-experiments-recovery.sh: 82ef9fa667e65eb7bbf2030aac54ca685eb44466ed33ce251321c45a45a2bcda
 proprietary/vendor/bin/pixel_irq_load_balancer: 637cd5910c9417acf5287c33ec2355c38b753f019ce78741f9c07aa13c5e66dc
-proprietary/vendor/bin/pixelstats-vendor: a926589fef82cbe49c7a92ccb649b7a71ad850fc94e8ebf924b8fcb74409c49d
+proprietary/vendor/bin/pixelstats-vendor: 367c6ee6d8fdf83d6f119020dc59068438d7fd3294fababf70c4ff0ea140a389
 proprietary/vendor/bin/predump_touch.sh: 153c0625e2d262e4f8973915b32ade9fd9e197148f0586dbfdc1ebc53e7e0366
 proprietary/vendor/bin/pvrhwperfd: 13bab94a5303cf2df36a7eddee512d27ff8b3a24d03e4bbcc66c9700c57b8674
 proprietary/vendor/bin/rebalance_interrupts-vendor: 62e442f9d929d06dad5810c54b86f0837330723b6df8760cf06fedd1ed8456ad
@@ -3765,7 +3765,7 @@ proprietary/vendor/etc/init/google.hardware.media.c2@3.0-service.rc: e52c1c80748
 proprietary/vendor/etc/init/hostapd.android.rc: a09021175637f73d790f1015b849e3a6c441dba05477fbcde33fa35ce64fb1b6
 proprietary/vendor/etc/init/hw: dir
 proprietary/vendor/etc/init/hw/init.efs.rc: 0548cc00099c183948381cbbb611e014fe5a23c70cc04b6eb148c5315ea1a15a
-proprietary/vendor/etc/init/hw/init.laguna.rc: b2544e7442a367c15e7799376e905037c0053145ff6dfcd8f174ea9dc067cf21
+proprietary/vendor/etc/init/hw/init.laguna.rc: 93f137c9c5c34e863691f22726ea64de2c855b626c2698f11a8104e88c5f9859
 proprietary/vendor/etc/init/hw/init.laguna.usb.rc: 6a9fbca25ab20c8f4cb5cb9ee2a04dc7b9fb0b8e6a3477ffd8be0d23653db458
 proprietary/vendor/etc/init/hw/init.persist.rc: 6065d8794876c77ac56246b8533561c3adfaabe3dec10d397ebe32f442416088
 proprietary/vendor/etc/init/hw/init.rango.rc: 83bfff442bec6257903683dd020133dccbdb76f4aaff904c9df86c2979f52a6c
@@ -3798,13 +3798,14 @@ proprietary/vendor/etc/init/libg3a_ghawb.rc: a89584a12ddd9c63fab8e63d312c811ca35
 proprietary/vendor/etc/init/memtrack.rc: c32b9eab16fbe57816e8672a02cb08ac68ccf90c28ab32135b80dc9512fb5dd4
 proprietary/vendor/etc/init/mosey.rc: 610bfff12609ab93d2eb7fdab84fccf24861e65d9e7b3a84629d24f77245f727
 proprietary/vendor/etc/init/pcie_power.rc: 52ef7306b1251e395958da6a4deb41192c26dd4aa92ca06f2e1b4346afd08881
+proprietary/vendor/etc/init/pixel-bgtasks-experiment.rc: 625697146738f6f795b0bd2fecc9f2e8db0642a06fb27bd40e8cab42e01757e5
 proprietary/vendor/etc/init/pixel-experiments-recovery.rc: 6867dcf1d5dc2eb30f9d1204f9c23052c25a5c5eb72b8d9325df1c230134f41d
 proprietary/vendor/etc/init/pixel-gnss-default.rc: 7eac3bbf4f5a1adffad4a1c4a5180fa4950e746b161ebc31cdd06fc217014781
 proprietary/vendor/etc/init/pixel-mm-gki.rc: 44373966ed3217974c377e106787280a065a4547ebf7ed47c12f2a13b969766f
 proprietary/vendor/etc/init/pixel-thermal-symlinks.rc: a8cb65590b1f74e29c4983978d9421074606b8a1ba13ba09d0b4f0f43ddde8ec
 proprietary/vendor/etc/init/pixel-ubp-experiment.rc: 8b41a7b0bea90343ed824d42bc91b0e7f114c9348e4bce2c606f9a642de269c1
 proprietary/vendor/etc/init/pixel.gralloc.allocator-V2-service.rc: fdcee85a508657b4f6406449a6a74e6fa64d80e7e4b262e887781b70130a8326
-proprietary/vendor/etc/init/pixelstats-vendor.laguna.rc: 84b27752dd5f296db87919d1f61ddfcfa3826d64740ef875ab3eac0fef26f6a2
+proprietary/vendor/etc/init/pixelstats-vendor.laguna.rc: 25b2b2ffa90c0670d4922fd48fcb302a2e5237ef5f98d02173dcce00124d138f
 proprietary/vendor/etc/init/pktrouter.rc: 8b3aacd550bdbab4c2b3897145bd866fb6a472867006b673f52ae3c29c7f67d5
 proprietary/vendor/etc/init/rebalance_interrupts-vendor.gs101.rc: 156312a4b8667b8b6401c0371bdc6384b186219e5106f5b33e6b854c22ef7668
 proprietary/vendor/etc/init/rfsd.rc: b5a8a370c1e1fc64d12de4e0688b8120afa25b04077954165be37e2828811ae3
@@ -3818,7 +3819,7 @@ proprietary/vendor/etc/init/vendor.google.aam.rc: f4e184b3c444dd663e7a30c27b8cb4
 proprietary/vendor/etc/init/vendor.google.ambience_hub-default.rc: 1a689294a792dac010819f7052a9ef4b15825e733a1fadcb2af844dea49aa456
 proprietary/vendor/etc/init/vendor.google.battery_mitigation-default.rc: 460c8df5ebd8b116f778ca7a7d69ed2cd7190cdab40b12599af390a35dcd9ac0
 proprietary/vendor/etc/init/vendor.google.edgetpu_vendor_service@1.0-service.rc: 145a79e37a278bd8e251b1261f9f361efd72ce1451135898dcdc552b275d49c7
-proprietary/vendor/etc/init/vendor.google.google_battery-default.rc: 74a3d3cc6af6bcfa39b093ffd8eb2be5d39c96f00a7c4b23a782d50c9198671b
+proprietary/vendor/etc/init/vendor.google.google_battery-default.rc: 8fbd37a50e1df34ead209f87948aeba3b102e45d7a4cb40272fd5b1a76cdbf70
 proprietary/vendor/etc/init/vendor.google.modem_ml_svc_sit.rc: bc13061d7c8b5fcb7942ea0f29e3cfbc204f84bc3013fb1ccfbdd6fb9696c6a6
 proprietary/vendor/etc/init/vendor.google.plat_security-service.rc: 8651367b7fa2ce1012ec830e61d856c91620cd9e20382dd36ee67e801ffbbde1
 proprietary/vendor/etc/init/vendor.google.radioext@1.0-service.rc: d9a76eaa675f6344a35fceeeeba3910a34193f23854ee6aa97f87f194e3e9961
@@ -3857,8 +3858,8 @@ proprietary/vendor/etc/open_carrier_info.dat: 3704b6d7e0f9fe8c792d68dbb75c4001d2
 proprietary/vendor/etc/panel_config_google-rgea_cal0.pb: 7e3da596c26dccd0964c53a3f67801f68ea9ad3831506afb0f9967f0e1b09928
 proprietary/vendor/etc/panel_config_google-rgeb_cal1.pb: a0fa82353a287a57d9aef2c066a6ba7478b87db8f830524e7fd9a50c3e9e98d1
 proprietary/vendor/etc/panel_ctrl_google-rgea_cal0.pb: b7efd6362325b63923a0b73f731eac0a257887c3cd557953b4568e9567bcd1a3
-proprietary/vendor/etc/pixelstats_config.json: 4115cbeeffe38730cf09f32df1c4127601c7f4014f5fc07fd23072fb71f7c28d
-proprietary/vendor/etc/powerhint.json: 1de2a808b9252de7719021165cac1251a22d0157b9aff2b17d263ed9dd5c0fb6
+proprietary/vendor/etc/pixelstats_config.json: 626179e230507484f27cafd2611ec33b30c7f695240614ecd62221a8147b38a0
+proprietary/vendor/etc/powerhint.json: 361526fed31af49a9d8cac4eecd30d651e80eac74fe147e4210eb8949e9d79c6
 proprietary/vendor/etc/powervr.ini: 90a42e7fa6983287dde8c4af39cb8c8ff6f997d0f333e1a279fb02864acb627e
 proprietary/vendor/etc/public.libraries.txt: c094291bff1c4b4495a3d3695c3b6ad87cd2908e8d091d483abc2e8bf300e857
 proprietary/vendor/etc/res: dir
@@ -3888,12 +3889,13 @@ proprietary/vendor/etc/tcm_test_cfg.ini: 44c889a3027afaf3eedf2970fbce0c5c5414e3b
 proprietary/vendor/etc/telephony: dir
 proprietary/vendor/etc/telephony/satellite_access_config.json: b5f13c8cd7d582d0c9c204e447201ce4c6ed5f42cb72337683fdf13bc12bc7bf
 proprietary/vendor/etc/telephony/sats2.dat: a5af86cc0c241a931ccd01d2c0f8b4a58aa252632a55064a7aaa750e6f88bf13
-proprietary/vendor/etc/thermal_info_config.json: b84d5263f4d2def92d54b3f4d34f9855e33927a907ca5b8898ea62af67eed0c9
-proprietary/vendor/etc/thermal_info_config_charge.json: 69ba8e450fe020f13b2d0b7a1d9c99cf63a655b9d21ab6d0bc5eb8c5053ce769
-proprietary/vendor/etc/thermal_info_config_stats.json: 88f8a91120dd46141e282c9d9af09bd2b7657bf41180a8b3a830ff7727a819dc
-proprietary/vendor/etc/thermal_info_config_throttling.json: 8b58f6c1107fe1433db4d0345154a14c71996b8ba014b95d628f3351b38f145a
+proprietary/vendor/etc/thermal_info_config.json: 5d42dc39d3f97e01faf50d88f880caca24d5b04e6580b5e6350de85cc0ff33c1
+proprietary/vendor/etc/thermal_info_config_charge.json: 2b40f6b414a288cf21bd2d833f6b78d73e9a5145d26527999ca36f59c264725c
+proprietary/vendor/etc/thermal_info_config_lpm.json: 6e172f2f94af38a3f02ded4dbae7e43c1be641e566f60271776e50e1bddab373
+proprietary/vendor/etc/thermal_info_config_stats.json: e43ce34fa4bd58810910e5202d70b5486662d37bb59a4359cf3e56dc36d60ab6
+proprietary/vendor/etc/thermal_info_config_throttling.json: d58d5aa39e2189073c520ae67420008aff2e790915f16bfa87825603d9077140
 proprietary/vendor/etc/thermal_info_config_vt.json: dcb48a251d2718243d70c407e3f564100d29a9ded407455062e89436599a701a
-proprietary/vendor/etc/thermal_info_config_wingboard.json: 317fcfa01c84d1e082ad946e3f01de2e2f1b0e0b010228f56ed7d9129754234d
+proprietary/vendor/etc/thermal_info_config_wingboard.json: 34a63a2e41692b2268900e028391fa692f86ea8109bc65aa67891d1223d7afb0
 proprietary/vendor/etc/touchflow_inner.pb: 015e42c54b96d9ad9318d4482cc5c2d14849c3c13f9c9d5dd28a658991dd2456
 proprietary/vendor/etc/touchflow_outer.pb: a2f7e25908b4190f3a93bee121c1ccc38a1688a7d2cf4e3aa96bd634a04a99dd
 proprietary/vendor/etc/twoshay_config.json: 4f9ce8f4485bf8b2a813dec70a3350dccbd31fb34754932b944345f8306517ee
@@ -6844,10 +6846,10 @@ proprietary/vendor/lib64/libnos_transport.so: 57de206f40b6ed9841bbfaacaf441ff904
 proprietary/vendor/lib64/libnosprotos.so: 537f38b0cdfc2b1b6e4113e8f5341c9f6ec1d6168c99244541948f1aad6be995
 proprietary/vendor/lib64/liboemcrypto.so: 044ecd5337215475428e9cc112356f90d6ed9e0e3b6c690a21f20418246f3bfe
 proprietary/vendor/lib64/liboemservice.so: 0a9c28f9c586956a15b28640c3d45f8876d68ff8825918583534cbccc792550d
-proprietary/vendor/lib64/libperfmgr.so: a92ca32c238d02b181575ee04053dbc60d7cdc3f1ccb43a9545ceba7152b7053
-proprietary/vendor/lib64/libpixelatoms_defs.so: bf3c49f9e7ef30ffc5fd43bd2b7429e95877e2182f01e47306cd209c0ddfeca5
+proprietary/vendor/lib64/libperfmgr.so: 4fa20f9fb81ef7b718105ee9b2ea3d6bad3698bc87601e282e65df14b71a33c1
+proprietary/vendor/lib64/libpixelatoms_defs.so: 48f124a67101f9b76422372cb77983202de19534e926e23b5ccd01fb5842d9e3
 proprietary/vendor/lib64/libpixelhealth.so: 729eabed07f0a2d545643854ce11b6c41c8e02fe143b97715e94af384c957c62
-proprietary/vendor/lib64/libpixelstats.so: cff3d6cdf1a3eb7ccb84dd45bd1a2cbc80b090d8f7e7347f3048895470f6b4d2
+proprietary/vendor/lib64/libpixelstats.so: a5b73fc28bdfc93d712295872857d66832bb5a2308645a93d68ae2c7f9c16e6c
 proprietary/vendor/lib64/libprotobuf-cpp-full-6.33.1.so: 7fdedeb80d9fa171eef04cbe1f7657dcddf46d36acf7eee9bb78820af189fb96
 proprietary/vendor/lib64/libprotobuf-cpp-lite-6.33.1.so: 1a5f05c5ffb76931735c0c38979d3a67b690bd088e05d8f45d448debbcc84f89
 proprietary/vendor/lib64/libril-aidl.so: 84e581f39c62f004c396e1c8ff273892efcea8cf5d9faa77055c29f165d35934
@@ -6888,9 +6890,10 @@ proprietary/vendor/lib64/modemml-tflite-service-aidl-V1-ndk.so: 1ae60aae45d38bac
 proprietary/vendor/lib64/nos_app_avb.so: edfc3c830b130765972929b9ffc3bcc394f7e340b0991fbe64732d9f081e2bbb
 proprietary/vendor/lib64/nos_app_keymaster.so: d9e45a70cbfb1a405b048a1366df96e505071ffbb07871b1eb1fd2e5187299ba
 proprietary/vendor/lib64/nos_app_weaver.so: 63ce1b1e9c13194ffb489788034b21ee072f3536d1fd6afb2fc5bb5eee04df2a
-proprietary/vendor/lib64/pixel-power-ext-V1-ndk.so: 76277a94f25aae9adc48852dce84443f087f5ecf5d124addb2955475310e9912
+proprietary/vendor/lib64/pixel-power-ext-V1-ndk.so: e0751ac492b3a1961833196812058ceaaea6ad103e2c19f35dc06422a0235f61
+proprietary/vendor/lib64/pixel-power-ext-V2-ndk.so: f7309ffda361bb88d5d27a6b45b1b31232f73e3b89d1cce0a018e467557ca376
 proprietary/vendor/lib64/pixel_stateresidency_provider_aidl_interface-ndk.so: a72e50e826432a371a3729fdfbb1f9cf6ef27759bfe8a6c297ab37d15ca9d600
-proprietary/vendor/lib64/pixelatoms-cpp.so: e9038aac254a859d91bb86cf86d50e1813570ef4ac1763fc8d65d0ce782b87c8
+proprietary/vendor/lib64/pixelatoms-cpp.so: 9cf6b2866da556c306a47ed0018a8a6bf31a9116391d1c2b69a566fd95ad498b
 proprietary/vendor/lib64/pixelpowerstats_provider_aidl_interface-cpp.so: e91ed340e63dfd9233703634e1061a5563d8cb4fdbfe7bb5130a6fb80876ee0a
 proprietary/vendor/lib64/sensors.usf.so: acbf313e139273240785a1e3c46feee5e871928522af22ca6add3d0109d6d615
 proprietary/vendor/lib64/soundfx: dir
@@ -6933,7 +6936,7 @@ proprietary/vendor_ramdisk/system/etc: dir
 proprietary/vendor_ramdisk/system/etc/fstab.gem5: 232ebf49ef4632a41db9dca58a9252103cfd76a3be15308c49d71fb341376c81
 proprietary/vendor_ramdisk/system/etc/fstab.laguna: c8ff21f6b74d802e2559dbc45ef87489f11a91655276792911b2a867b2c794af
 proprietary/vendor_ramdisk/system/etc/fstab.laguna-fips: 6a2df14f597b6188876fb7abfa8d927556a17beb6a60fd82c4d5f3bc1b0d9175
-rango.mk: 0f17553defc78aff63d3123f53341a1abcfa31de70f68af8602f943568295aa6
+rango.mk: d5dfd9351c44b2da151de83d24c459a7f4797f61179113c52ce4178eed69423d
 sepolicy: dir
 sepolicy/product: dir
 sepolicy/product/private: dir

From 5ba69ce5f53fc288eaa282b5bb163183085bc008 Mon Sep 17 00:00:00 2001
From: inthewaves <inthewaves@pm.me>
Date: Tue, 10 Mar 2026 15:56:36 -0700
Subject: [PATCH 6/6] add vt_estimation_model_display.tflite from 16 QPR3

This is needed by the Pixel Thermal HAL in 16 QPR3 on rango.
---
 config/device/common/file-inclusion.yml    | 1 +
 config/device/common/gen10pixel.yml        | 1 +
 vendor-skels/google_devices/rango/rango.mk | 1 +
 vendor-specs/google_devices/rango.yml      | 3 ++-
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/config/device/common/file-inclusion.yml b/config/device/common/file-inclusion.yml
index e10095209..74dfed7ab 100644
--- a/config/device/common/file-inclusion.yml
+++ b/config/device/common/file-inclusion.yml
@@ -969,6 +969,7 @@ filters:
       - vendor/etc/uwb/samsung_uwb_region.json
       - vendor/etc/vt_estimation_model.tflite
       - vendor/etc/vt_estimation_model_bottom_spk.tflite
+      - vendor/etc/vt_estimation_model_display.tflite
       - vendor/etc/vt_estimation_model_top_spk.tflite
       - vendor/etc/vt_estimation_odpm_model.tflite
       - vendor/etc/vt_prediction_lstm_model.tflite
diff --git a/config/device/common/gen10pixel.yml b/config/device/common/gen10pixel.yml
index ece52f98a..d864ac15a 100644
--- a/config/device/common/gen10pixel.yml
+++ b/config/device/common/gen10pixel.yml
@@ -25,6 +25,7 @@ backport_files:
     - etc/thermal_info_config_throttling.json
     - etc/thermal_info_config_vt.json
     - etc/thermal_info_config_wingboard.json
+    - etc/vt_estimation_model_display.tflite
     - lib64/libperfmgr.so
     - lib64/libpixelatoms_defs.so
     - lib64/libpixelstats.so
diff --git a/vendor-skels/google_devices/rango/rango.mk b/vendor-skels/google_devices/rango/rango.mk
index eef7ea81f..de4755b47 100644
--- a/vendor-skels/google_devices/rango/rango.mk
+++ b/vendor-skels/google_devices/rango/rango.mk
@@ -1857,6 +1857,7 @@ PRODUCT_COPY_FILES += \
     vendor/google_devices/rango/proprietary/vendor/etc/uwb/samsung_uwb_hal_conf.json:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/samsung_uwb_hal_conf.json \
     vendor/google_devices/rango/proprietary/vendor/etc/uwb/samsung_uwb_region.json:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/samsung_uwb_region.json \
     vendor/google_devices/rango/proprietary/vendor/etc/vt_estimation_model_bottom_spk.tflite:$(TARGET_COPY_OUT_VENDOR)/etc/vt_estimation_model_bottom_spk.tflite \
+    vendor/google_devices/rango/proprietary/vendor/etc/vt_estimation_model_display.tflite:$(TARGET_COPY_OUT_VENDOR)/etc/vt_estimation_model_display.tflite \
     vendor/google_devices/rango/proprietary/vendor/etc/vt_estimation_model_top_spk.tflite:$(TARGET_COPY_OUT_VENDOR)/etc/vt_estimation_model_top_spk.tflite \
     vendor/google_devices/rango/proprietary/vendor/etc/vt_estimation_model.tflite:$(TARGET_COPY_OUT_VENDOR)/etc/vt_estimation_model.tflite \
     vendor/google_devices/rango/proprietary/vendor/etc/wifi/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \
diff --git a/vendor-specs/google_devices/rango.yml b/vendor-specs/google_devices/rango.yml
index 8480b4b7e..3d4b23aff 100644
--- a/vendor-specs/google_devices/rango.yml
+++ b/vendor-specs/google_devices/rango.yml
@@ -3910,6 +3910,7 @@ proprietary/vendor/etc/uwb/samsung_uwb_hal_conf.json: 1706a7c49f3726f45f5cd374ae
 proprietary/vendor/etc/uwb/samsung_uwb_region.json: 8543ce14d8a77426620c2bbde3c2206defebd2483187539d9867c47c50001786
 proprietary/vendor/etc/vt_estimation_model.tflite: 4de2f8d2a19d3a21b23b5ac9bb4f65093dc2ac3e46846f03728a4429ced6ec79
 proprietary/vendor/etc/vt_estimation_model_bottom_spk.tflite: c5a607ad8ccc262282839c387c974c1220a49d57b2f63b1d75ac54cb41faaba9
+proprietary/vendor/etc/vt_estimation_model_display.tflite: 2ed10c3dbe8cd705c13f7966d500ef3e076388bb0b9611670eafaff80cc85108
 proprietary/vendor/etc/vt_estimation_model_top_spk.tflite: 5e4c02252224fdec09a6f2e88b6a8eb67c67ee15ec32039db17ba55a64f82956
 proprietary/vendor/etc/wifi: dir
 proprietary/vendor/etc/wifi/coex_table.xml: 1ea8d5dda08fb0afd271c99e3842ad7afb8a698f66f57931aa6797c899bf0489
@@ -6936,7 +6937,7 @@ proprietary/vendor_ramdisk/system/etc: dir
 proprietary/vendor_ramdisk/system/etc/fstab.gem5: 232ebf49ef4632a41db9dca58a9252103cfd76a3be15308c49d71fb341376c81
 proprietary/vendor_ramdisk/system/etc/fstab.laguna: c8ff21f6b74d802e2559dbc45ef87489f11a91655276792911b2a867b2c794af
 proprietary/vendor_ramdisk/system/etc/fstab.laguna-fips: 6a2df14f597b6188876fb7abfa8d927556a17beb6a60fd82c4d5f3bc1b0d9175
-rango.mk: d5dfd9351c44b2da151de83d24c459a7f4797f61179113c52ce4178eed69423d
+rango.mk: 21402a48febe9a888ce045e51d3f0d31aa740925b2617a2c3f5c1cc9f5f2d558
 sepolicy: dir
 sepolicy/product: dir
 sepolicy/product/private: dir