diff --git a/conf/init.zuma.rc b/conf/init.zuma.rc
index 277026b1..fa9191bf 100644
--- a/conf/init.zuma.rc
+++ b/conf/init.zuma.rc
@@ -332,15 +332,15 @@ on init
     write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu6_memlat@17000010/mem_latency/ratio_ceil 3700
     write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu7_memlat@17000010/mem_latency/ratio_ceil 3700
     write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu8_memlat@17000010/mem_latency/ratio_ceil 3400
-    write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu0_memlat@17000010/mem_latency/stall_floor 3400
-    write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu1_memlat@17000010/mem_latency/stall_floor 3400
-    write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu2_memlat@17000010/mem_latency/stall_floor 3400
-    write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu3_memlat@17000010/mem_latency/stall_floor 3400
-    write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu4_memlat@17000010/mem_latency/stall_floor 2600
-    write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu5_memlat@17000010/mem_latency/stall_floor 2600
-    write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu6_memlat@17000010/mem_latency/stall_floor 2600
-    write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu7_memlat@17000010/mem_latency/stall_floor 2600
-    write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu8_memlat@17000010/mem_latency/stall_floor 900
+    write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu0_memlat@17000010/mem_latency/stall_floor 3000
+    write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu1_memlat@17000010/mem_latency/stall_floor 3000
+    write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu2_memlat@17000010/mem_latency/stall_floor 3000
+    write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu3_memlat@17000010/mem_latency/stall_floor 3000
+    write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu4_memlat@17000010/mem_latency/stall_floor 2400
+    write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu5_memlat@17000010/mem_latency/stall_floor 2400
+    write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu6_memlat@17000010/mem_latency/stall_floor 2400
+    write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu7_memlat@17000010/mem_latency/stall_floor 2400
+    write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu8_memlat@17000010/mem_latency/stall_floor 500
 
     # Set boost_adpf_prio, -1 by default
     write /proc/vendor_sched/boost_adpf_prio ${persist.device_config.vendor_system_native_boot.boost_adpf_prio:--1}
@@ -817,6 +817,13 @@ on property:sys.boot_completed=1
     write /sys/devices/system/cpu/cpufreq/policy8/sched_pixel/pmu_limit_enable 1
     write /proc/vendor_sched/pmu_poll_enable 0
 
+    # Make devices on the critical path for suspend/resume asynchronous
+    write /sys/devices/platform/fixedregulator@0/regulator/regulator.2/power/async "enabled"
+    write /sys/devices/platform/fixedregulator@0/power/async "enabled"
+    write /sys/devices/platform/26040000.clock-controller/power/async "enabled"
+    write /sys/devices/platform/10840000.pinctrl/power/async "enabled"
+    write /sys/devices/platform/13060000.pinctrl/power/async "enabled"
+
     # Setup cpu.shares to throttle background groups (bg ~ 5% sysbg ~ 5% dex2oat ~2.5%)
     write /dev/cpuctl/background/cpu.shares 1024
     write /dev/cpuctl/system-background/cpu.shares 1024
diff --git a/conf/ueventd.zuma.rc b/conf/ueventd.zuma.rc
index 964d4211..13ca8eba 100644
--- a/conf/ueventd.zuma.rc
+++ b/conf/ueventd.zuma.rc
@@ -219,6 +219,8 @@
 /dev/dma_heap/sensor_direct_heap       0444   system     graphics
 /dev/dma_heap/aaudio_playback_heap     0444   system     audio
 /dev/dma_heap/aaudio_capture_heap      0444   system     audio
+/dev/dma_heap/gcma_camera              0444   system     system
+/dev/dma_heap/gcma_camera-uncached     0444   system     system
 
 # Direct Charging
 /dev/logbuffer_pca9468_tcpm            0600   system     system
diff --git a/device.mk b/device.mk
index eb7eafb5..6eabac17 100644
--- a/device.mk
+++ b/device.mk
@@ -1091,7 +1091,9 @@ PRODUCT_PROPERTY_OVERRIDES += \
 
 # Suspend properties
 PRODUCT_PROPERTY_OVERRIDES += \
-    suspend.short_suspend_threshold_millis=5000
+    suspend.short_suspend_threshold_millis=2000 \
+    suspend.max_sleep_time_millis=40000 \
+    suspend.short_suspend_backoff_enabled=true
 
 # Enable Incremental on the device
 PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/pixelstats/service.cpp b/pixelstats/service.cpp
index 13ab5c34..333a32fb 100644
--- a/pixelstats/service.cpp
+++ b/pixelstats/service.cpp
@@ -88,7 +88,8 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = {
         "/sys/devices/platform/exynos-drm/secondary-panel/error_count_te",
         "/sys/devices/platform/exynos-drm/secondary-panel/error_count_unknown",
     },
-    .PDMStatePath = "/sys/devices/platform/audiometrics/pdm_state"
+    .PDMStatePath = "/sys/devices/platform/audiometrics/pdm_state",
+    .WavesPath = "/sys/devices/platform/audiometrics/waves"
 };
 
 const struct UeventListener::UeventPaths ueventPaths = {