diff --git a/device-comet.mk b/device-comet.mk
index f440521..8a4c58c 100644
--- a/device-comet.mk
+++ b/device-comet.mk
@@ -70,7 +70,7 @@ include device/google/gs-common/display/dump_second_display.mk
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=2
+    ro.vendor.build.svn=3
 
 # go/lyric-soong-variables
 $(call soong_config_set,lyric,camera_hardware,comet)
diff --git a/powerhint-comet.json b/powerhint-comet.json
index f8446e6..bbbbf3d 100644
--- a/powerhint-comet.json
+++ b/powerhint-comet.json
@@ -627,9 +627,10 @@
       "Values": [
         "76",
         "55",
-        "38",
-        "36",
         "10",
+        "47",
+        "45",
+        "36",
         "30",
         "28"
       ],
@@ -652,10 +653,9 @@
       "Values": [
         "59",
         "30",
-        "20",
         "2",
-        "18",
-        "15"
+        "23",
+        "20"
       ],
       "DefaultIndex": 0
     },
@@ -676,8 +676,7 @@
         "62",
         "0",
         "20",
-        "22",
-        "15"
+        "22"
       ],
       "DefaultIndex": 0
     },
@@ -1812,7 +1811,7 @@
       "PowerHint": "CAMERA_STREAMING_EXTREME",
       "Node": "PMU_LIT_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "36"
+      "Value": "47"
     },
     {
       "PowerHint": "CAMERA_STREAMING_EXTREME",
@@ -1824,7 +1823,7 @@
       "PowerHint": "CAMERA_STREAMING_EXTREME",
       "Node": "PMU_MID_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "15"
+      "Value": "20"
     },
     {
       "PowerHint": "CAMERA_STREAMING_EXTREME",
@@ -1836,7 +1835,7 @@
       "PowerHint": "CAMERA_STREAMING_EXTREME",
       "Node": "PMU_BIG_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "15"
+      "Value": "20"
     },
     {
       "PowerHint": "CAMERA_STREAMING_EXTREME",
@@ -1950,7 +1949,7 @@
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "PMU_LIT_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "38"
+      "Value": "45"
     },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
@@ -1962,7 +1961,7 @@
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "PMU_MID_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "20"
+      "Value": "30"
     },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
@@ -2106,7 +2105,7 @@
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PMU_LIT_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "30"
+      "Value": "47"
     },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
@@ -2118,7 +2117,7 @@
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PMU_MID_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "18"
+      "Value": "23"
     },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
@@ -3061,7 +3060,7 @@
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "PMU_LIT_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "28"
+      "Value": "47"
     },
     {
       "PowerHint": "CAMERA_PROJECT11",
@@ -3073,7 +3072,7 @@
       "PowerHint": "CAMERA_PROJECT11",
       "Node": "PMU_MID_SPC_THRESHOLD",
       "Duration": 0,
-      "Value": "18"
+      "Value": "23"
     },
     {
       "PowerHint": "CAMERA_PROJECT11",