diff --git a/device-caiman.mk b/device-caiman.mk
index 5127667b..6b58ef0f 100644
--- a/device-caiman.mk
+++ b/device-caiman.mk
@@ -48,8 +48,8 @@ include device/google/caimito/audio/caiman/audio-tables.mk
 include device/google/zumapro/device-shipping-common.mk
 include hardware/google/pixel/vibrator/cs40l26/device.mk
 include device/google/gs-common/bcmbt/bluetooth.mk
-include device/google/gs-common/touch/gti/gti.mk
-include device/google/gs-common/touch/syna/syna20.mk
+include device/google/gs-common/touch/gti/predump_gti.mk
+include device/google/gs-common/touch/syna/predump_syna20.mk
 include device/google/caimito/fingerprint/ultrasonic_udfps.mk
 include device/google/gs-common/modem/radio_ext/radio_ext.mk
 include device/google/gs-common/pixelsupport/pixelsupport.mk
diff --git a/device-komodo.mk b/device-komodo.mk
index ce51c593..3d496f3a 100644
--- a/device-komodo.mk
+++ b/device-komodo.mk
@@ -48,8 +48,8 @@ include device/google/caimito/audio/komodo/audio-tables.mk
 include device/google/zumapro/device-shipping-common.mk
 include hardware/google/pixel/vibrator/cs40l26/device.mk
 include device/google/gs-common/bcmbt/bluetooth.mk
-include device/google/gs-common/touch/gti/gti.mk
-include device/google/gs-common/touch/syna/syna20.mk
+include device/google/gs-common/touch/gti/predump_gti.mk
+include device/google/gs-common/touch/syna/predump_syna20.mk
 include device/google/caimito/fingerprint/ultrasonic_udfps.mk
 include device/google/gs-common/modem/radio_ext/radio_ext.mk
 include device/google/gs-common/pixelsupport/pixelsupport.mk
diff --git a/device-tokay.mk b/device-tokay.mk
index 6931919f..ea5ac832 100644
--- a/device-tokay.mk
+++ b/device-tokay.mk
@@ -38,8 +38,8 @@ include device/google/caimito/audio/tokay/audio-tables.mk
 include device/google/zumapro/device-shipping-common.mk
 include hardware/google/pixel/vibrator/cs40l26/device.mk
 include device/google/gs-common/bcmbt/bluetooth.mk
-include device/google/gs-common/touch/gti/gti.mk
-include device/google/gs-common/touch/syna/syna20.mk
+include device/google/gs-common/touch/gti/predump_gti.mk
+include device/google/gs-common/touch/syna/predump_syna20.mk
 include device/google/caimito/fingerprint/ultrasonic_udfps.mk
 include device/google/gs-common/modem/radio_ext/radio_ext.mk
 include device/google/gs-common/pixelsupport/pixelsupport.mk
diff --git a/perf/powerhint-caiman.json b/perf/powerhint-caiman.json
index 53087e27..f3f7f4b8 100644
--- a/perf/powerhint-caiman.json
+++ b/perf/powerhint-caiman.json
@@ -259,6 +259,7 @@
       "Path": "/proc/vendor_sched/groups/ta/uclamp_min",
       "Values": [
         "765",
+        "600",
         "1"
       ],
       "ResetOnInit": true
@@ -613,6 +614,7 @@
       "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/spc_threshold",
       "Values": [
         "70",
+        "55",
         "42",
         "35",
         "30",
@@ -1452,6 +1454,12 @@
       "Duration": 3000,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "TAUClampBoost",
+      "Duration": 3000,
+      "Value": "600"
+    },
     {
       "PowerHint": "CAMERA_THERMAL_SEVERE_BOOST",
       "Node": "CDPreferHighCap",
@@ -2074,7 +2082,7 @@
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PMU_LIT_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "42"
+      "Value": "55"
     },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
@@ -2092,7 +2100,7 @@
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PMU_MID_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "18"
+      "Value": "30"
     },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
@@ -3171,7 +3179,7 @@
       "HBoostOffMissedCycles": 5,
       "HBoostPidPuFactor": 0.5,
       "HBoostUclampMin": 722,
-      "JunkCheckTimeFactor": 1.2,
+      "JankCheckTimeFactor": 1.43,
       "LowFrameRateThreshold": 25,
       "MaxRecordsNum": 300,
       "GpuBoost": true,
@@ -3206,7 +3214,7 @@
       "HBoostOffMissedCycles": 5,
       "HBoostPidPuFactor": 0.5,
       "HBoostUclampMin": 722,
-      "JunkCheckTimeFactor": 1.2,
+      "JankCheckTimeFactor": 1.43,
       "LowFrameRateThreshold": 25,
       "MaxRecordsNum": 300,
       "GpuBoost": true,
@@ -3241,7 +3249,7 @@
       "HBoostOffMissedCycles": 5,
       "HBoostPidPuFactor": 0.5,
       "HBoostUclampMin": 722,
-      "JunkCheckTimeFactor": 1.2,
+      "JankCheckTimeFactor": 1.43,
       "LowFrameRateThreshold": 25,
       "MaxRecordsNum": 300,
       "GpuBoost": true,
diff --git a/perf/powerhint-komodo.json b/perf/powerhint-komodo.json
index 89da0af6..401ce0b4 100644
--- a/perf/powerhint-komodo.json
+++ b/perf/powerhint-komodo.json
@@ -259,6 +259,7 @@
       "Path": "/proc/vendor_sched/groups/ta/uclamp_min",
       "Values": [
         "765",
+        "600",
         "1"
       ],
       "ResetOnInit": true
@@ -613,6 +614,7 @@
       "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/spc_threshold",
       "Values": [
         "70",
+        "55",
         "42",
         "35",
         "30",
@@ -1452,6 +1454,12 @@
       "Duration": 3000,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "TAUClampBoost",
+      "Duration": 3000,
+      "Value": "600"
+    },
     {
       "PowerHint": "CAMERA_THERMAL_SEVERE_BOOST",
       "Node": "CDPreferHighCap",
@@ -2074,7 +2082,7 @@
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PMU_LIT_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "42"
+      "Value": "55"
     },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
@@ -2092,7 +2100,7 @@
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PMU_MID_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "18"
+      "Value": "30"
     },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
@@ -3171,7 +3179,7 @@
       "HBoostOffMissedCycles": 5,
       "HBoostPidPuFactor": 0.5,
       "HBoostUclampMin": 722,
-      "JunkCheckTimeFactor": 1.2,
+      "JankCheckTimeFactor": 1.43,
       "LowFrameRateThreshold": 25,
       "MaxRecordsNum": 300,
       "GpuBoost": true,
@@ -3206,7 +3214,7 @@
       "HBoostOffMissedCycles": 5,
       "HBoostPidPuFactor": 0.5,
       "HBoostUclampMin": 722,
-      "JunkCheckTimeFactor": 1.2,
+      "JankCheckTimeFactor": 1.43,
       "LowFrameRateThreshold": 25,
       "MaxRecordsNum": 300,
       "GpuBoost": true,
@@ -3241,7 +3249,7 @@
       "HBoostOffMissedCycles": 5,
       "HBoostPidPuFactor": 0.5,
       "HBoostUclampMin": 722,
-      "JunkCheckTimeFactor": 1.2,
+      "JankCheckTimeFactor": 1.43,
       "LowFrameRateThreshold": 25,
       "MaxRecordsNum": 300,
       "GpuBoost": true,
diff --git a/perf/powerhint-ripcurrentpro.json b/perf/powerhint-ripcurrentpro.json
index 99d9d979..d2984619 100644
--- a/perf/powerhint-ripcurrentpro.json
+++ b/perf/powerhint-ripcurrentpro.json
@@ -312,6 +312,7 @@
       "Path": "/proc/vendor_sched/groups/ta/uclamp_min",
       "Values": [
         "765",
+        "600",
         "1"
       ],
       "ResetOnInit": true
@@ -696,6 +697,7 @@
       "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/spc_threshold",
       "Values": [
         "70",
+        "55",
         "42",
         "35",
         "30",
@@ -1441,6 +1443,12 @@
       "Duration": 3000,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "TAUClampBoost",
+      "Duration": 3000,
+      "Value": "600"
+    },
     {
       "PowerHint": "CAMERA_THERMAL_SEVERE_BOOST",
       "Node": "CDPreferHighCap",
@@ -2063,7 +2071,7 @@
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PMU_LIT_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "42"
+      "Value": "55"
     },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
@@ -2081,7 +2089,7 @@
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PMU_MID_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "18"
+      "Value": "30"
     },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
diff --git a/perf/powerhint-tokay.json b/perf/powerhint-tokay.json
index 53087e27..f3f7f4b8 100644
--- a/perf/powerhint-tokay.json
+++ b/perf/powerhint-tokay.json
@@ -259,6 +259,7 @@
       "Path": "/proc/vendor_sched/groups/ta/uclamp_min",
       "Values": [
         "765",
+        "600",
         "1"
       ],
       "ResetOnInit": true
@@ -613,6 +614,7 @@
       "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/spc_threshold",
       "Values": [
         "70",
+        "55",
         "42",
         "35",
         "30",
@@ -1452,6 +1454,12 @@
       "Duration": 3000,
       "Value": "0"
     },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "TAUClampBoost",
+      "Duration": 3000,
+      "Value": "600"
+    },
     {
       "PowerHint": "CAMERA_THERMAL_SEVERE_BOOST",
       "Node": "CDPreferHighCap",
@@ -2074,7 +2082,7 @@
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PMU_LIT_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "42"
+      "Value": "55"
     },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
@@ -2092,7 +2100,7 @@
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PMU_MID_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "18"
+      "Value": "30"
     },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
@@ -3171,7 +3179,7 @@
       "HBoostOffMissedCycles": 5,
       "HBoostPidPuFactor": 0.5,
       "HBoostUclampMin": 722,
-      "JunkCheckTimeFactor": 1.2,
+      "JankCheckTimeFactor": 1.43,
       "LowFrameRateThreshold": 25,
       "MaxRecordsNum": 300,
       "GpuBoost": true,
@@ -3206,7 +3214,7 @@
       "HBoostOffMissedCycles": 5,
       "HBoostPidPuFactor": 0.5,
       "HBoostUclampMin": 722,
-      "JunkCheckTimeFactor": 1.2,
+      "JankCheckTimeFactor": 1.43,
       "LowFrameRateThreshold": 25,
       "MaxRecordsNum": 300,
       "GpuBoost": true,
@@ -3241,7 +3249,7 @@
       "HBoostOffMissedCycles": 5,
       "HBoostPidPuFactor": 0.5,
       "HBoostUclampMin": 722,
-      "JunkCheckTimeFactor": 1.2,
+      "JankCheckTimeFactor": 1.43,
       "LowFrameRateThreshold": 25,
       "MaxRecordsNum": 300,
       "GpuBoost": true,