diff --git a/device-oriole.mk b/device-oriole.mk
index 1cbeddf..9da7a90 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -80,9 +80,10 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/bluetooth_power_limits_GB7N6_EU.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GB7N6_EU.csv
 
 
-# Bluetooth SAR test tool
+# Bluetooth Hal Extension test tools
 PRODUCT_PACKAGES_DEBUG += \
-    sar_test
+    sar_test \
+    hci_inject
 
 # WirelessCharger
 DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs101/device_framework_matrix_product_wireless.xml
diff --git a/device-raven.mk b/device-raven.mk
index cd3ea77..4be41fb 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -86,9 +86,10 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/bluetooth_power_limits_raven_jp.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_JP.csv
 
 
-# Bluetooth SAR test tool
+# Bluetooth Hal Extension test tools
 PRODUCT_PACKAGES_DEBUG += \
-    sar_test
+    sar_test \
+    hci_inject
 
 # WirelessCharger
 DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs101/device_framework_matrix_product_wireless.xml
diff --git a/powerhint-oriole.json b/powerhint-oriole.json
index 845f8c0..e84ced9 100644
--- a/powerhint-oriole.json
+++ b/powerhint-oriole.json
@@ -169,6 +169,24 @@
       "DefaultIndex": 0,
       "ResetOnInit": true
     },
+    {
+      "Name": "UClampThreshold",
+      "Path": "/proc/vendor_sched/uclamp_threshold",
+      "Values": [
+        "0",
+        "8"
+      ],
+      "ResetOnInit": true
+    },
+    {
+      "Name": "ReduceRreferIdle",
+      "Path": "/proc/vendor_sched/reduce_prefer_idle",
+      "Values": [
+        "0",
+        "1"
+      ],
+      "ResetOnInit": true
+    },
     {
       "Name": "CDPreferIdle",
       "Path": "/proc/vendor_sched/cam_prefer_idle",
@@ -470,6 +488,18 @@
       "Duration": 0,
       "Value": "2"
     },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "UClampThreshold",
+      "Duration": 5000,
+      "Value": "0"
+    },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "ReduceRreferIdle",
+      "Duration": 5000,
+      "Value": "0"
+    },
     {
       "PowerHint": "LAUNCH",
       "Node": "FGPreferIdle",
diff --git a/powerhint-raven.json b/powerhint-raven.json
index d7b9c10..14969cf 100644
--- a/powerhint-raven.json
+++ b/powerhint-raven.json
@@ -169,6 +169,24 @@
       "DefaultIndex": 0,
       "ResetOnInit": true
     },
+    {
+      "Name": "UClampThreshold",
+      "Path": "/proc/vendor_sched/uclamp_threshold",
+      "Values": [
+        "0",
+        "8"
+      ],
+      "ResetOnInit": true
+    },
+    {
+      "Name": "ReduceRreferIdle",
+      "Path": "/proc/vendor_sched/reduce_prefer_idle",
+      "Values": [
+        "0",
+        "1"
+      ],
+      "ResetOnInit": true
+    },
     {
       "Name": "CDPreferIdle",
       "Path": "/proc/vendor_sched/cam_prefer_idle",
@@ -470,6 +488,18 @@
       "Duration": 0,
       "Value": "2"
     },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "UClampThreshold",
+      "Duration": 5000,
+      "Value": "0"
+    },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "ReduceRreferIdle",
+      "Duration": 5000,
+      "Value": "0"
+    },
     {
       "PowerHint": "LAUNCH_120FPS",
       "Node": "SFUClampBoost",
diff --git a/powerhint-slider.json b/powerhint-slider.json
index b77b714..2401845 100644
--- a/powerhint-slider.json
+++ b/powerhint-slider.json
@@ -173,6 +173,24 @@
       "DefaultIndex": 0,
       "ResetOnInit": true
     },
+    {
+      "Name": "UClampThreshold",
+      "Path": "/proc/vendor_sched/uclamp_threshold",
+      "Values": [
+        "0",
+        "8"
+      ],
+      "ResetOnInit": true
+    },
+    {
+      "Name": "ReduceRreferIdle",
+      "Path": "/proc/vendor_sched/reduce_prefer_idle",
+      "Values": [
+        "0",
+        "1"
+      ],
+      "ResetOnInit": true
+    },
     {
       "Name": "CDPreferIdle",
       "Path": "/proc/vendor_sched/cam_prefer_idle",
@@ -421,6 +439,18 @@
       "Duration": 0,
       "Value": "2"
     },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "UClampThreshold",
+      "Duration": 5000,
+      "Value": "0"
+    },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "ReduceRreferIdle",
+      "Duration": 5000,
+      "Value": "0"
+    },
     {
       "PowerHint": "LAUNCH_120FPS",
       "Node": "SFUClampBoost",
diff --git a/powerhint-whitefin.json b/powerhint-whitefin.json
index a862227..de8848d 100644
--- a/powerhint-whitefin.json
+++ b/powerhint-whitefin.json
@@ -173,6 +173,24 @@
       "DefaultIndex": 0,
       "ResetOnInit": true
     },
+    {
+      "Name": "UClampThreshold",
+      "Path": "/proc/vendor_sched/uclamp_threshold",
+      "Values": [
+        "0",
+        "8"
+      ],
+      "ResetOnInit": true
+    },
+    {
+      "Name": "ReduceRreferIdle",
+      "Path": "/proc/vendor_sched/reduce_prefer_idle",
+      "Values": [
+        "0",
+        "1"
+      ],
+      "ResetOnInit": true
+    },
     {
       "Name": "CDPreferIdle",
       "Path": "/proc/vendor_sched/cam_prefer_idle",
@@ -412,6 +430,18 @@
       "Duration": 0,
       "Value": "2"
     },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "UClampThreshold",
+      "Duration": 5000,
+      "Value": "0"
+    },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "ReduceRreferIdle",
+      "Duration": 5000,
+      "Value": "0"
+    },
     {
       "PowerHint": "LAUNCH_120FPS",
       "Node": "SFUClampBoost",