diff --git a/device-caiman.mk b/device-caiman.mk
index 89ea6cfc..0efba31f 100644
--- a/device-caiman.mk
+++ b/device-caiman.mk
@@ -69,8 +69,15 @@ include device/google/gs-common/modem/radio_ext/radio_ext.mk
 include device/google/gs-common/pixelsupport/pixelsupport.mk
 
 # Increment the SVN for any official public releases
+ifdef RELEASE_SVN_CAIMAN
+TARGET_SVN ?= $(RELEASE_SVN_CAIMAN)
+else
+# Set this for older releases that don't use build flag
+TARGET_SVN ?= 03
+endif
+
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=3
+    ro.vendor.build.svn=$(TARGET_SVN)
 
 # go/lyric-soong-variables
 $(call soong_config_set,lyric,camera_hardware,caiman)
diff --git a/device-komodo.mk b/device-komodo.mk
index b81efb18..6797e88c 100644
--- a/device-komodo.mk
+++ b/device-komodo.mk
@@ -69,8 +69,15 @@ include device/google/gs-common/modem/radio_ext/radio_ext.mk
 include device/google/gs-common/pixelsupport/pixelsupport.mk
 
 # Increment the SVN for any official public releases
+ifdef RELEASE_SVN_KOMODO
+TARGET_SVN ?= $(RELEASE_SVN_KOMODO)
+else
+# Set this for older releases that don't use build flag
+TARGET_SVN ?= 03
+endif
+
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=3
+    ro.vendor.build.svn=$(TARGET_SVN)
 
 # go/lyric-soong-variables
 $(call soong_config_set,lyric,camera_hardware,komodo)
diff --git a/device-tokay.mk b/device-tokay.mk
index 08555a72..90433f16 100644
--- a/device-tokay.mk
+++ b/device-tokay.mk
@@ -59,8 +59,15 @@ include device/google/gs-common/modem/radio_ext/radio_ext.mk
 include device/google/gs-common/pixelsupport/pixelsupport.mk
 
 # Increment the SVN for any official public releases
+ifdef RELEASE_SVN_TOKAY
+TARGET_SVN ?= $(RELEASE_SVN_TOKAY)
+else
+# Set this for older releases that don't use build flag
+TARGET_SVN ?= 03
+endif
+
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=3
+    ro.vendor.build.svn=$(TARGET_SVN)
 
 # go/lyric-soong-variables
 $(call soong_config_set,lyric,camera_hardware,tokay)
diff --git a/perf/powerhint-caiman.json b/perf/powerhint-caiman.json
index 5155848b..52f47d8f 100644
--- a/perf/powerhint-caiman.json
+++ b/perf/powerhint-caiman.json
@@ -337,6 +337,42 @@
       ],
       "ResetOnInit": true
     },
+    {
+      "Name": "TAUclampMinOnNiceEnable",
+      "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_enable",
+      "Values": [
+        "1",
+        "0"
+      ],
+      "ResetOnInit": true
+    },
+    {
+      "Name": "TAUclampMinOnNiceMidValue",
+      "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_mid_value",
+      "Values": [
+        "600",
+        "0"
+      ],
+      "ResetOnInit": true
+    },
+    {
+      "Name": "TAUclampMinOnNiceHighPrio",
+      "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_high_prio",
+      "Values": [
+        "119",
+        "120"
+      ],
+      "ResetOnInit": true
+    },
+    {
+      "Name": "TAUclampMinOnNiceMidPrio",
+      "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_mid_prio",
+      "Values": [
+        "128",
+        "130"
+      ],
+      "ResetOnInit": true
+    },
     {
       "Name": "FGUClampBoost",
       "Path": "/proc/vendor_sched/groups/fg/uclamp_min",
@@ -453,6 +489,7 @@
       "Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_high",
       "Values": [
         "0xff",
+        "0xf0",
         "0x7f"
       ],
       "ResetOnInit": true
@@ -462,6 +499,7 @@
       "Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_mid",
       "Values": [
         "0xff",
+        "0xf0",
         "0x7f"
       ],
       "ResetOnInit": true
@@ -471,6 +509,7 @@
       "Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_low",
       "Values": [
         "0xff",
+        "0xf0",
         "0x7f"
       ],
       "ResetOnInit": true
@@ -1578,9 +1617,57 @@
     },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
-      "Node": "TAUClampBoost",
+      "Node": "ReducePreferIdle",
       "Duration": 3000,
-      "Value": "600"
+      "Value": "0"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "TAPreferredIdleMaskHigh",
+      "Duration": 3000,
+      "Value": "0xf0"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "TAPreferredIdleMaskMid",
+      "Duration": 3000,
+      "Value": "0xf0"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "TAPreferredIdleMaskLow",
+      "Duration": 3000,
+      "Value": "0xf0"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "TAUclampMinOnNiceEnable",
+      "Duration": 3000,
+      "Value": "1"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "TAUclampMinOnNiceMidValue",
+       "Duration": 3000,
+       "Value": "600"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "TAUclampMinOnNiceHighPrio",
+      "Duration": 3000,
+      "Value": "119"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "TAUclampMinOnNiceMidPrio",
+      "Duration": 3000,
+      "Value": "128"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "TAPreferIdle",
+      "Duration": 3000,
+      "Value": "1"
     },
     {
       "PowerHint": "CAMERA_THERMAL_SEVERE_BOOST",
diff --git a/perf/powerhint-komodo.json b/perf/powerhint-komodo.json
index ee5e5cef..d9cd3f5a 100644
--- a/perf/powerhint-komodo.json
+++ b/perf/powerhint-komodo.json
@@ -337,6 +337,42 @@
       ],
       "ResetOnInit": true
     },
+    {
+      "Name": "TAUclampMinOnNiceEnable",
+      "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_enable",
+      "Values": [
+        "1",
+        "0"
+      ],
+      "ResetOnInit": true
+    },
+    {
+      "Name": "TAUclampMinOnNiceMidValue",
+      "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_mid_value",
+      "Values": [
+        "600",
+        "0"
+      ],
+      "ResetOnInit": true
+    },
+    {
+      "Name": "TAUclampMinOnNiceHighPrio",
+      "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_high_prio",
+      "Values": [
+        "119",
+        "120"
+      ],
+      "ResetOnInit": true
+    },
+    {
+      "Name": "TAUclampMinOnNiceMidPrio",
+      "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_mid_prio",
+      "Values": [
+        "128",
+        "130"
+      ],
+      "ResetOnInit": true
+    },
     {
       "Name": "FGUClampBoost",
       "Path": "/proc/vendor_sched/groups/fg/uclamp_min",
@@ -453,6 +489,7 @@
       "Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_high",
       "Values": [
         "0xff",
+        "0xf0",
         "0x7f"
       ],
       "ResetOnInit": true
@@ -462,6 +499,7 @@
       "Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_mid",
       "Values": [
         "0xff",
+        "0xf0",
         "0x7f"
       ],
       "ResetOnInit": true
@@ -471,6 +509,7 @@
       "Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_low",
       "Values": [
         "0xff",
+        "0xf0",
         "0x7f"
       ],
       "ResetOnInit": true
@@ -1576,12 +1615,60 @@
       "Duration": 3000,
       "Value": "0"
     },
+    {
+       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+       "Node": "ReducePreferIdle",
+       "Duration": 3000,
+       "Value": "0"
+    },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
-      "Node": "TAUClampBoost",
+      "Node": "TAPreferredIdleMaskHigh",
+      "Duration": 3000,
+      "Value": "0xf0"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "TAPreferredIdleMaskMid",
+      "Duration": 3000,
+      "Value": "0xf0"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "TAPreferredIdleMaskLow",
+      "Duration": 3000,
+      "Value": "0xf0"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "TAUclampMinOnNiceEnable",
+      "Duration": 3000,
+      "Value": "1"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "TAUclampMinOnNiceMidValue",
       "Duration": 3000,
       "Value": "600"
     },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "TAUclampMinOnNiceHighPrio",
+      "Duration": 3000,
+      "Value": "119"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "TAUclampMinOnNiceMidPrio",
+      "Duration": 3000,
+      "Value": "128"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "TAPreferIdle",
+      "Duration": 3000,
+      "Value": "1"
+    },
     {
       "PowerHint": "CAMERA_THERMAL_SEVERE_BOOST",
       "Node": "CDPreferHighCap",
diff --git a/perf/powerhint-ripcurrentpro.json b/perf/powerhint-ripcurrentpro.json
index c8c964b1..9d8ceacf 100644
--- a/perf/powerhint-ripcurrentpro.json
+++ b/perf/powerhint-ripcurrentpro.json
@@ -327,6 +327,42 @@
       ],
       "ResetOnInit": true
     },
+    {
+      "Name": "TAUclampMinOnNiceEnable",
+      "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_enable",
+      "Values": [
+        "1",
+        "0"
+      ],
+      "ResetOnInit": true
+    },
+    {
+      "Name": "TAUclampMinOnNiceMidValue",
+      "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_mid_value",
+      "Values": [
+        "600",
+        "0"
+      ],
+      "ResetOnInit": true
+    },
+    {
+      "Name": "TAUclampMinOnNiceHighPrio",
+      "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_high_prio",
+      "Values": [
+        "119",
+        "120"
+      ],
+      "ResetOnInit": true
+    },
+    {
+      "Name": "TAUclampMinOnNiceMidPrio",
+      "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_mid_prio",
+      "Values": [
+        "128",
+        "130"
+      ],
+      "ResetOnInit": true
+    },
     {
       "Name": "FGUClampBoost",
       "Path": "/proc/vendor_sched/groups/fg/uclamp_min",
@@ -443,6 +479,7 @@
       "Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_high",
       "Values": [
         "0xff",
+        "0xf0",
         "0x7f"
       ],
       "ResetOnInit": true
@@ -452,6 +489,7 @@
       "Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_mid",
       "Values": [
         "0xff",
+        "0xf0",
         "0x7f"
       ],
       "ResetOnInit": true
@@ -461,6 +499,7 @@
       "Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_low",
       "Values": [
         "0xff",
+        "0xf0",
         "0x7f"
       ],
       "ResetOnInit": true
@@ -1498,9 +1537,57 @@
     },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
-      "Node": "TAUClampBoost",
+      "Node": "ReducePreferIdle",
       "Duration": 3000,
-      "Value": "600"
+      "Value": "0"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "TAPreferredIdleMaskHigh",
+      "Duration": 3000,
+      "Value": "0xf0"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "TAPreferredIdleMaskMid",
+      "Duration": 3000,
+      "Value": "0xf0"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "TAPreferredIdleMaskLow",
+      "Duration": 3000,
+      "Value": "0xf0"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "TAUclampMinOnNiceEnable",
+      "Duration": 3000,
+      "Value": "1"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "TAUclampMinOnNiceMidValue",
+       "Duration": 3000,
+       "Value": "600"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "TAUclampMinOnNiceHighPrio",
+      "Duration": 3000,
+      "Value": "119"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "TAUclampMinOnNiceMidPrio",
+      "Duration": 3000,
+      "Value": "128"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "TAPreferIdle",
+      "Duration": 3000,
+      "Value": "1"
     },
     {
       "PowerHint": "CAMERA_THERMAL_SEVERE_BOOST",
diff --git a/perf/powerhint-tokay.json b/perf/powerhint-tokay.json
index 5155848b..52f47d8f 100644
--- a/perf/powerhint-tokay.json
+++ b/perf/powerhint-tokay.json
@@ -337,6 +337,42 @@
       ],
       "ResetOnInit": true
     },
+    {
+      "Name": "TAUclampMinOnNiceEnable",
+      "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_enable",
+      "Values": [
+        "1",
+        "0"
+      ],
+      "ResetOnInit": true
+    },
+    {
+      "Name": "TAUclampMinOnNiceMidValue",
+      "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_mid_value",
+      "Values": [
+        "600",
+        "0"
+      ],
+      "ResetOnInit": true
+    },
+    {
+      "Name": "TAUclampMinOnNiceHighPrio",
+      "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_high_prio",
+      "Values": [
+        "119",
+        "120"
+      ],
+      "ResetOnInit": true
+    },
+    {
+      "Name": "TAUclampMinOnNiceMidPrio",
+      "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_mid_prio",
+      "Values": [
+        "128",
+        "130"
+      ],
+      "ResetOnInit": true
+    },
     {
       "Name": "FGUClampBoost",
       "Path": "/proc/vendor_sched/groups/fg/uclamp_min",
@@ -453,6 +489,7 @@
       "Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_high",
       "Values": [
         "0xff",
+        "0xf0",
         "0x7f"
       ],
       "ResetOnInit": true
@@ -462,6 +499,7 @@
       "Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_mid",
       "Values": [
         "0xff",
+        "0xf0",
         "0x7f"
       ],
       "ResetOnInit": true
@@ -471,6 +509,7 @@
       "Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_low",
       "Values": [
         "0xff",
+        "0xf0",
         "0x7f"
       ],
       "ResetOnInit": true
@@ -1578,9 +1617,57 @@
     },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
-      "Node": "TAUClampBoost",
+      "Node": "ReducePreferIdle",
       "Duration": 3000,
-      "Value": "600"
+      "Value": "0"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "TAPreferredIdleMaskHigh",
+      "Duration": 3000,
+      "Value": "0xf0"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "TAPreferredIdleMaskMid",
+      "Duration": 3000,
+      "Value": "0xf0"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "TAPreferredIdleMaskLow",
+      "Duration": 3000,
+      "Value": "0xf0"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "TAUclampMinOnNiceEnable",
+      "Duration": 3000,
+      "Value": "1"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "TAUclampMinOnNiceMidValue",
+       "Duration": 3000,
+       "Value": "600"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "TAUclampMinOnNiceHighPrio",
+      "Duration": 3000,
+      "Value": "119"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "TAUclampMinOnNiceMidPrio",
+      "Duration": 3000,
+      "Value": "128"
+    },
+    {
+      "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
+      "Node": "TAPreferIdle",
+      "Duration": 3000,
+      "Value": "1"
     },
     {
       "PowerHint": "CAMERA_THERMAL_SEVERE_BOOST",