diff --git a/conf/init.zuma.rc b/conf/init.zuma.rc
index 0b98cce2..d814ab24 100644
--- a/conf/init.zuma.rc
+++ b/conf/init.zuma.rc
@@ -410,8 +410,8 @@ on post-fs-data
     restorecon /sys/kernel/debug/tracing/trace_marker
 
     # ranging sensor
-    chown system system /dev/stmvl53l1_ranging
-    chmod 0660 /dev/stmvl53l1_ranging
+    chown system system /dev/ispolin_ranging
+    chmod 0660 /dev/ispolin_ranging
 
     # Factory calibration files
     chmod 0771 /mnt/vendor/persist/camera
@@ -741,19 +741,9 @@ on property:sys.boot_completed=1
     write /proc/vendor_sched/ta_uclamp_min 1
     write /proc/vendor_sched/fg_uclamp_min 0
     write /proc/vendor_sched/sys_prefer_idle 0
-    # cfs_rq clamp is using tg->uclamp setting
-    # align it with the vendor_group setting
-    write /proc/vendor_sched/bg_uclamp_max 512
-    write /dev/cpuctl/background/cpu.uclamp.max 50
-    write /proc/vendor_sched/bg_group_throttle 512
-    write /proc/vendor_sched/sysbg_uclamp_max 512
-    write /dev/cpuctl/system-background/cpu.uclamp.max 50
-    write /proc/vendor_sched/sysbg_group_throttle 512
-    write /proc/vendor_sched/dex2oat_uclamp_max 615
-    write /dev/cpuctl/dex2oat/cpu.uclamp.max 60
-    write /proc/vendor_sched/dex2oat_group_throttle 615
-    write /proc/vendor_sched/ota_uclamp_max 410
-    write /proc/vendor_sched/ota_group_throttle 410
+
+    # Set bg group throttle
+    write /proc/vendor_sched/vug_bg_group_throttle 308
 
     # Set PMU freq limit parameters
     write /sys/devices/system/cpu/cpufreq/policy0/sched_pixel/lcpi_threshold 2
@@ -918,9 +908,22 @@ on post-fs-data
     mkdir /data/vendor/bluetooth 0770 bluetooth system
 
 # ODPM
-on fs
-    chown system system /sys/devices/platform/acpm_mfd_bus@18100000/i2c-7/i2c-s2mpg12mfd/s2mpg12-meter/s2mpg12-odpm/iio\:device0/enabled_rails
-    chown system system /sys/devices/platform/acpm_mfd_bus@18110000/i2c-8/i2c-s2mpg13mfd/s2mpg13-meter/s2mpg13-odpm/iio\:device1/enabled_rails
+on early-boot && property:ro.boot.hardware.sku=GC3VE
+    write /sys/bus/iio/devices/iio:device0/enabled_rails "CH11=BUCK12S"
+on early-boot && property:ro.boot.hardware.sku=GZPF0
+    write /sys/bus/iio/devices/iio:device0/enabled_rails "CH11=BUCK12S"
+on early-boot && property:ro.boot.hardware.sku=GPJ41
+    write /sys/bus/iio/devices/iio:device0/enabled_rails "CH11=BUCK12S"
+on early-boot && property:ro.boot.hardware.sku=G9BQD
+    write /sys/bus/iio/devices/iio:device0/enabled_rails "CH11=BUCK12S"
+on early-boot && property:ro.boot.hardware.sku=GKV4X
+    write /sys/bus/iio/devices/iio:device0/enabled_rails "CH11=BUCK12S"
+on early-boot && property:ro.boot.hardware.sku=G6GPR
+    write /sys/bus/iio/devices/iio:device0/enabled_rails "CH11=BUCK12S"
+on early-boot && property:ro.boot.hardware.sku=G576D
+    write /sys/bus/iio/devices/iio:device0/enabled_rails "CH11=BUCK12S"
+on early-boot && property:ro.boot.hardware.sku=GGH2X
+    write /sys/bus/iio/devices/iio:device0/enabled_rails "CH11=BUCK12S"
 
 on post-fs-data
     mkdir /data/vendor/powerstats 0771 system system
diff --git a/device.mk b/device.mk
index 05389a73..09894dfd 100644
--- a/device.mk
+++ b/device.mk
@@ -34,6 +34,7 @@ include device/google/gs-common/camera/dump.mk
 include device/google/gs-common/radio/dump.mk
 include device/google/gs-common/gear/dumpstate/aidl.mk
 include device/google/gs-common/umfw_stat/umfw_stat.mk
+include device/google/gs-common/widevine/widevine.mk
 
 include device/google/zuma/dumpstate/item.mk
 
@@ -259,6 +260,8 @@ endif
 # Mali Configuration Properties
 # b/221255664 prevents setting PROTECTED_MAX_CORE_COUNT=2
 PRODUCT_VENDOR_PROPERTIES += \
+	vendor.mali.platform.config=/vendor/etc/mali/platform.config \
+	vendor.mali.debug.config=/vendor/etc/mali/debug.config \
       	vendor.mali.base_protected_max_core_count=1 \
 	vendor.mali.base_protected_tls_max=67108864 \
 	vendor.mali.platform_agt_frequency_khz=24576
@@ -1003,7 +1006,7 @@ $(call soong_config_set,aoc,target_product,$(TARGET_PRODUCT))
 ## Audio properties
 ##Audio Vendor property
 PRODUCT_PROPERTY_OVERRIDES += \
-	persist.vendor.audio.cca.enabled=false \
+	persist.vendor.audio.cca.enabled=true \
 	persist.vendor.audio.cca.unsupported=false
 
 PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/pixelstats/service.cpp b/pixelstats/service.cpp
index cd09dc1b..783b80d0 100644
--- a/pixelstats/service.cpp
+++ b/pixelstats/service.cpp
@@ -44,6 +44,7 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = {
     .CodecPath =     "/sys/devices/platform/audiometrics/codec_state",
     .EEPROMPath = "/dev/battery_history",
     .MitigationPath = "/sys/devices/virtual/pmic/mitigation",
+    .MitigationDurationPath = "/sys/devices/virtual/pmic/mitigation/irq_dur_cnt",
     .BrownoutReasonProp = "vendor.brownout_reason",
     .BrownoutLogPath = "/data/vendor/mitigation/lastmeal.txt",
     .SpeakerTemperaturePath = "/sys/devices/platform/audiometrics/speaker_temp",
diff --git a/task_profiles.json b/task_profiles.json
index 4bcfe412..961857de 100644
--- a/task_profiles.json
+++ b/task_profiles.json
@@ -287,7 +287,7 @@
     },
     {
       "Name": "OtaProfiles",
-      "Profiles": [ "OtaPerformance", "ServiceCapacityLow", "LowIoPriority", "TimerSlackHigh" ]
+      "Profiles": [ "OtaPerformance", "ProcessCapacityNormal", "LowIoPriority", "TimerSlackHigh" ]
     }
   ]
 }
diff --git a/widevine/device.mk b/widevine/device.mk
index f91de716..90181bc2 100644
--- a/widevine/device.mk
+++ b/widevine/device.mk
@@ -1,6 +1 @@
-PRODUCT_PACKAGES += \
-	android.hardware.drm-service.clearkey
-
--include vendor/widevine/libwvdrmengine/apex/device/device.mk
-
 BOARD_VENDOR_SEPOLICY_DIRS += device/google/zuma-sepolicy/widevine