diff --git a/OWNERS b/OWNERS
index 492973e..0914422 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,4 +1,4 @@
 per-file perf/*,thermal/*= jenhaochen@google.com,wvw@google.com,joaodias@google.com
 
 # per-file for Pixel device makefiles, see go/pixel-device-mk-owner-checklist for details.
-per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:master:/OWNERS
+per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:main:/OWNERS
diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json
index 142f0b8..63af423 100644
--- a/perf/powerhint-husky.json
+++ b/perf/powerhint-husky.json
@@ -281,6 +281,16 @@
       "DefaultIndex": 0,
       "ResetOnInit": true
     },
+    {
+      "Name": "Dex2oatUClampMaxBoost",
+      "Path": "/proc/vendor_sched/dex2oat_uclamp_max",
+      "Values": [
+        "-2",
+        "615"
+      ],
+      "DefaultIndex": 0,
+      "ResetOnInit": true
+    },
     {
       "Name": "CAMUClampBoost",
       "Path": "/proc/vendor_sched/cam_uclamp_min",
@@ -766,6 +776,15 @@
         "20 40"
       ],
       "ResetOnInit": true
+    },
+    {
+      "Name": "SchedLibMaskIn",
+      "Path": "/proc/vendor_sched/sched_lib_mask_in",
+      "Values": [
+        "0x100",
+        "0x0"
+      ],
+      "ResetOnInit": true
     }
   ],
   "Actions": [
@@ -840,6 +859,12 @@
       "Duration": 5000,
       "Value": "512"
     },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "Dex2oatUClampMaxBoost",
+      "Duration": 5000,
+      "Value": "615"
+    },
     {
       "PowerHint": "LAUNCH",
       "Node": "TAUClampBoost",
@@ -922,6 +947,12 @@
       "Duration": 5000,
       "Value": "1"
     },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "SchedLibMaskIn",
+      "Duration": 5000,
+      "Value": "0x100"
+    },
     {
       "PowerHint": "LAUNCH_EXTEND",
       "Node": "CPUBigClusterMaxFreq",
@@ -952,6 +983,24 @@
       "Duration": 2000,
       "Value": "0"
     },
+    {
+      "PowerHint": "LAUNCH_EXTEND",
+      "Node": "CPUUClampMaxFilterEnable",
+      "Duration": 2000,
+      "Value": "0"
+    },
+    {
+      "PowerHint": "LAUNCH_EXTEND",
+      "Node": "BGUClampMaxBoost",
+      "Duration": 2000,
+      "Value": "512"
+    },
+    {
+      "PowerHint": "LAUNCH_EXTEND",
+      "Node": "Dex2oatUClampMaxBoost",
+      "Duration": 2000,
+      "Value": "615"
+    },
     {
       "PowerHint": "LAUNCH_EXTEND",
       "Node": "CPULittleClusterDownRateLimitUs",
@@ -982,6 +1031,12 @@
       "Duration": 2000,
       "Value": "1"
     },
+    {
+      "PowerHint": "LAUNCH_EXTEND",
+      "Node": "SchedLibMaskIn",
+      "Duration": 5000,
+      "Value": "0x100"
+    },
     {
       "PowerHint": "LAUNCH_PMU",
       "Node": "PMU_POLL",
@@ -2428,6 +2483,12 @@
       "Duration": 0,
       "Value": "1"
     },
+    {
+      "PowerHint": "GAME",
+      "Node": "SchedLibMaskIn",
+      "Duration": 0,
+      "Value": "0x100"
+    },
     {
       "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT",
       "Node": "PMU_POLL",
diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json
index a987091..2747e57 100644
--- a/perf/powerhint-ripcurrent.json
+++ b/perf/powerhint-ripcurrent.json
@@ -267,6 +267,16 @@
       "DefaultIndex": 0,
       "ResetOnInit": true
     },
+    {
+      "Name": "Dex2oatUClampMaxBoost",
+      "Path": "/proc/vendor_sched/dex2oat_uclamp_max",
+      "Values": [
+        "-2",
+        "615"
+      ],
+      "DefaultIndex": 0,
+      "ResetOnInit": true
+    },
     {
       "Name": "CAMUClampBoost",
       "Path": "/proc/vendor_sched/cam_uclamp_min",
@@ -788,6 +798,15 @@
         "20 40"
       ],
       "ResetOnInit": true
+    },
+    {
+      "Name": "SchedLibMaskIn",
+      "Path": "/proc/vendor_sched/sched_lib_mask_in",
+      "Values": [
+        "0x100",
+        "0x0"
+      ],
+      "ResetOnInit": true
     }
   ],
   "Actions": [
@@ -862,6 +881,12 @@
       "Duration": 5000,
       "Value": "512"
     },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "Dex2oatUClampMaxBoost",
+      "Duration": 5000,
+      "Value": "615"
+    },
     {
       "PowerHint": "LAUNCH",
       "Node": "TAUClampBoost",
@@ -944,6 +969,12 @@
       "Duration": 5000,
       "Value": "1"
     },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "SchedLibMaskIn",
+      "Duration": 5000,
+      "Value": "0x100"
+    },
     {
       "PowerHint": "LAUNCH_EXTEND",
       "Node": "CPUBigClusterMaxFreq",
@@ -974,6 +1005,24 @@
       "Duration": 2000,
       "Value": "0"
     },
+    {
+      "PowerHint": "LAUNCH_EXTEND",
+      "Node": "CPUUClampMaxFilterEnable",
+      "Duration": 2000,
+      "Value": "0"
+    },
+    {
+      "PowerHint": "LAUNCH_EXTEND",
+      "Node": "BGUClampMaxBoost",
+      "Duration": 2000,
+      "Value": "512"
+    },
+    {
+      "PowerHint": "LAUNCH_EXTEND",
+      "Node": "Dex2oatUClampMaxBoost",
+      "Duration": 2000,
+      "Value": "615"
+    },
     {
       "PowerHint": "LAUNCH_EXTEND",
       "Node": "CPULittleClusterDownRateLimitUs",
@@ -1004,6 +1053,12 @@
       "Duration": 2000,
       "Value": "1"
     },
+    {
+      "PowerHint": "LAUNCH_EXTEND",
+      "Node": "SchedLibMaskIn",
+      "Duration": 5000,
+      "Value": "0x100"
+    },
     {
       "PowerHint": "LAUNCH_PMU",
       "Node": "PMU_POLL",
@@ -2187,6 +2242,12 @@
       "Duration": 0,
       "Value": "1"
     },
+    {
+      "PowerHint": "GAME",
+      "Node": "SchedLibMaskIn",
+      "Duration": 0,
+      "Value": "0x100"
+    },
     {
       "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT",
       "Node": "PMU_POLL",
diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json
index 14d971b..87b42ce 100644
--- a/perf/powerhint-shiba.json
+++ b/perf/powerhint-shiba.json
@@ -281,6 +281,16 @@
       "DefaultIndex": 0,
       "ResetOnInit": true
     },
+    {
+      "Name": "Dex2oatUClampMaxBoost",
+      "Path": "/proc/vendor_sched/dex2oat_uclamp_max",
+      "Values": [
+        "-2",
+        "615"
+      ],
+      "DefaultIndex": 0,
+      "ResetOnInit": true
+    },
     {
       "Name": "CAMUClampBoost",
       "Path": "/proc/vendor_sched/cam_uclamp_min",
@@ -766,6 +776,15 @@
         "20 40"
       ],
       "ResetOnInit": true
+    },
+    {
+      "Name": "SchedLibMaskIn",
+      "Path": "/proc/vendor_sched/sched_lib_mask_in",
+      "Values": [
+        "0x100",
+        "0x0"
+      ],
+      "ResetOnInit": true
     }
   ],
   "Actions": [
@@ -840,6 +859,12 @@
       "Duration": 5000,
       "Value": "512"
     },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "Dex2oatUClampMaxBoost",
+      "Duration": 5000,
+      "Value": "615"
+    },
     {
       "PowerHint": "LAUNCH",
       "Node": "TAUClampBoost",
@@ -922,6 +947,12 @@
       "Duration": 5000,
       "Value": "1"
     },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "SchedLibMaskIn",
+      "Duration": 5000,
+      "Value": "0x100"
+    },
     {
       "PowerHint": "LAUNCH_EXTEND",
       "Node": "CPUBigClusterMaxFreq",
@@ -952,6 +983,24 @@
       "Duration": 2000,
       "Value": "0"
     },
+    {
+      "PowerHint": "LAUNCH_EXTEND",
+      "Node": "CPUUClampMaxFilterEnable",
+      "Duration": 2000,
+      "Value": "0"
+    },
+    {
+      "PowerHint": "LAUNCH_EXTEND",
+      "Node": "BGUClampMaxBoost",
+      "Duration": 2000,
+      "Value": "512"
+    },
+    {
+      "PowerHint": "LAUNCH_EXTEND",
+      "Node": "Dex2oatUClampMaxBoost",
+      "Duration": 2000,
+      "Value": "615"
+    },
     {
       "PowerHint": "LAUNCH_EXTEND",
       "Node": "CPULittleClusterDownRateLimitUs",
@@ -982,6 +1031,12 @@
       "Duration": 2000,
       "Value": "1"
     },
+    {
+      "PowerHint": "LAUNCH_EXTEND",
+      "Node": "SchedLibMaskIn",
+      "Duration": 5000,
+      "Value": "0x100"
+    },
     {
       "PowerHint": "LAUNCH_PMU",
       "Node": "PMU_POLL",
@@ -2332,6 +2387,12 @@
       "Duration": 0,
       "Value": "1"
     },
+    {
+      "PowerHint": "GAME",
+      "Node": "SchedLibMaskIn",
+      "Duration": 0,
+      "Value": "0x100"
+    },
     {
       "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT",
       "Node": "PMU_POLL",
diff --git a/thermal/thermal_info_config_husky.json b/thermal/thermal_info_config_husky.json
index 970b6d0..7d31e4c 100644
--- a/thermal/thermal_info_config_husky.json
+++ b/thermal/thermal_info_config_husky.json
@@ -1185,6 +1185,18 @@
                     "Name": "VIRTUAL-SKIN-SUB-7",
                     "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51]
                 },
+                {
+                    "Name": "VIRTUAL-SKIN-SUB-8",
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51]
+                },
+                {
+                    "Name": "VIRTUAL-SKIN-SUB-9",
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51]
+                },
+                {
+                    "Name": "VIRTUAL-SKIN-SUB-10",
+                    "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51]
+                },
                 {
                     "Name": "VIRTUAL-SKIN-CHARGE",
                     "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51]
@@ -1193,7 +1205,62 @@
                     "Name": "VIRTUAL-USB-THROTTLING",
                     "Thresholds": [3.0]
                 }
-            ]
+            ],
+            "Abnormality": {
+                "Outlier": {
+                    "Configs": [
+                        {
+                            "Monitor": [
+                                "VIRTUAL-SKIN",
+                                "VIRTUAL-SKIN-SUB-0",
+                                "VIRTUAL-SKIN-SUB-1",
+                                "VIRTUAL-SKIN-SUB-2",
+                                "VIRTUAL-SKIN-SUB-3",
+                                "VIRTUAL-SKIN-SUB-4",
+                                "VIRTUAL-SKIN-SUB-5",
+                                "VIRTUAL-SKIN-SUB-6",
+                                "VIRTUAL-SKIN-SUB-7",
+                                "VIRTUAL-SKIN-SUB-8",
+                                "VIRTUAL-SKIN-SUB-9",
+                                "VIRTUAL-SKIN-SUB-10"
+                            ],
+                            "TempRange": [0.0, 55.0]
+                        }
+                    ]
+                },
+                "Stuck": {
+                    "Configs": [
+                        {
+                            "Monitor":  [
+                                "VIRTUAL-SKIN",
+                                "VIRTUAL-SKIN-SUB-0",
+                                "VIRTUAL-SKIN-SUB-1",
+                                "VIRTUAL-SKIN-SUB-2",
+                                "VIRTUAL-SKIN-SUB-3",
+                                "VIRTUAL-SKIN-SUB-4",
+                                "VIRTUAL-SKIN-SUB-5",
+                                "VIRTUAL-SKIN-SUB-6",
+                                "VIRTUAL-SKIN-SUB-7",
+                                "VIRTUAL-SKIN-SUB-8",
+                                "VIRTUAL-SKIN-SUB-9",
+                                "VIRTUAL-SKIN-SUB-10",
+                                "VIRTUAL-SKIN-SPEAKER",
+                                "VIRTUAL-SKIN-SPEAKER-SUB-0",
+                                "VIRTUAL-SKIN-SPEAKER-SUB-1",
+                                "VIRTUAL-SKIN-SPEAKER-SUB-2",
+                                "VIRTUAL-SKIN-FRONT",
+                                "VIRTUAL-SKIN-FRONT-SUB-0",
+                                "VIRTUAL-SKIN-FRONT-SUB-1",
+                                "VIRTUAL-SKIN-FRONT-SUB-2"
+                            ],
+                            "TempStuck": {
+                                "MinPollingCount": 8,
+                                "MinStuckDuration": 120000
+                            }
+                        }
+                    ]
+                }
+            }
         },
         "CoolingDevices": {
             "RecordVotePerSensor": {
diff --git a/thermal/thermal_info_config_shiba.json b/thermal/thermal_info_config_shiba.json
index 87adbb9..5609d65 100644
--- a/thermal/thermal_info_config_shiba.json
+++ b/thermal/thermal_info_config_shiba.json
@@ -1226,7 +1226,61 @@
                     "Name": "VIRTUAL-USB-THROTTLING",
                     "Thresholds": [3.0]
                 }
-            ]
+            ],
+            "Abnormality": {
+                "Outlier": {
+                    "Configs": [
+                        {
+                            "Monitor": [
+                                "VIRTUAL-SKIN",
+                                "VIRTUAL-SKIN-SUB-0",
+                                "VIRTUAL-SKIN-SUB-1",
+                                "VIRTUAL-SKIN-SUB-2",
+                                "VIRTUAL-SKIN-SUB-3",
+                                "VIRTUAL-SKIN-SUB-4",
+                                "VIRTUAL-SKIN-SUB-5",
+                                "VIRTUAL-SKIN-SUB-6",
+                                "VIRTUAL-SKIN-SUB-7",
+                                "VIRTUAL-SKIN-SUB-8"
+                            ],
+                            "TempRange": [0.0, 55.0]
+                        }
+                    ]
+                },
+                "Stuck": {
+                    "Configs": [
+                        {
+                            "Monitor":  [
+                                "VIRTUAL-SKIN",
+                                "VIRTUAL-SKIN-SUB-0",
+                                "VIRTUAL-SKIN-SUB-1",
+                                "VIRTUAL-SKIN-SUB-2",
+                                "VIRTUAL-SKIN-SUB-3",
+                                "VIRTUAL-SKIN-SUB-4",
+                                "VIRTUAL-SKIN-SUB-5",
+                                "VIRTUAL-SKIN-SUB-6",
+                                "VIRTUAL-SKIN-SUB-7",
+                                "VIRTUAL-SKIN-SUB-8",
+                                "VIRTUAL-SKIN-SPEAKER",
+                                "VIRTUAL-SKIN-SPEAKER-SUB-0",
+                                "VIRTUAL-SKIN-SPEAKER-SUB-1",
+                                "VIRTUAL-SKIN-SPEAKER-SUB-2",
+                                "VIRTUAL-SKIN-SPEAKER-SUB-3",
+                                "VIRTUAL-SKIN-FRONT",
+                                "VIRTUAL-SKIN-FRONT-SUB-0",
+                                "VIRTUAL-SKIN-FRONT-SUB-1",
+                                "VIRTUAL-SKIN-FRONT-SUB-2",
+                                "VIRTUAL-SKIN-FRONT-SUB-3",
+                                "VIRTUAL-SKIN-FRONT-SUB-4"
+                            ],
+                            "TempStuck": {
+                                "MinPollingCount": 8,
+                                "MinStuckDuration": 120000
+                            }
+                        }
+                    ]
+                }
+            }
         },
         "CoolingDevices": {
             "RecordVotePerSensor": {