diff --git a/cheetah/rro_overlays/UwbOverlay/Android.bp b/cheetah/rro_overlays/UwbOverlay/Android.bp
new file mode 100644
index 0000000..a6156ea
--- /dev/null
+++ b/cheetah/rro_overlays/UwbOverlay/Android.bp
@@ -0,0 +1,18 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "//device/google/pantah:device_google_pantah_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: [
+        "//device/google/pantah/cheetah:device_google_pantah_license",
+    ],
+}
+
+runtime_resource_overlay {
+    name: "UwbOverlayC10",
+    theme: "UwbOverlayC10",
+    certificate: "platform",
+    sdk_version: "current",
+    product_specific: true
+}
diff --git a/cheetah/rro_overlays/UwbOverlay/AndroidManifest.xml b/cheetah/rro_overlays/UwbOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..57dfd5b
--- /dev/null
+++ b/cheetah/rro_overlays/UwbOverlay/AndroidManifest.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<!-- Pixel specific uwb overlays -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.uwb.resources.pixel"
+    android:versionCode="1"
+    android:versionName="1.0">
+    <application android:hasCode="false" />
+    <overlay
+      android:targetPackage="com.android.uwb.resources"
+      android:targetName="UwbCustomization"
+      android:isStatic="true"
+      android:priority="0"/>
+</manifest>
diff --git a/cheetah/rro_overlays/UwbOverlay/OWNERS b/cheetah/rro_overlays/UwbOverlay/OWNERS
new file mode 100644
index 0000000..2395d7f
--- /dev/null
+++ b/cheetah/rro_overlays/UwbOverlay/OWNERS
@@ -0,0 +1,3 @@
+# People who can approve changes for submission
+include platform/packages/modules/Uwb:/OWNERS
+victorliu@google.com
diff --git a/cheetah/rro_overlays/UwbOverlay/res/values/config.xml b/cheetah/rro_overlays/UwbOverlay/res/values/config.xml
new file mode 100644
index 0000000..7a77d32
--- /dev/null
+++ b/cheetah/rro_overlays/UwbOverlay/res/values/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+<resources>
+</resources>
diff --git a/device-cheetah.mk b/device-cheetah.mk
index 6e88c98..c42442b 100644
--- a/device-cheetah.mk
+++ b/device-cheetah.mk
@@ -258,8 +258,8 @@ else
 include device/google/gs101/fingerprint/udfps_factory.mk
 endif
 
-# WiFi Overlay
 PRODUCT_PACKAGES += \
+    UwbOverlayC10 \
     WifiOverlay2022_C10
 
 PRODUCT_SOONG_NAMESPACES += device/google/pantah/cheetah/
diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json
index 391028f..7223fa2 100644
--- a/powerhint-cheetah.json
+++ b/powerhint-cheetah.json
@@ -136,15 +136,6 @@
       ],
       "ResetOnInit": true
     },
-    {
-      "Name": "UClampThreshold",
-      "Path": "/proc/vendor_sched/uclamp_threshold",
-      "Values": [
-        "0",
-        "8"
-      ],
-      "ResetOnInit": true
-    },
     {
       "Name": "ReducePreferIdle",
       "Path": "/proc/vendor_sched/reduce_prefer_idle",
@@ -662,12 +653,6 @@
       "Duration": 1000,
       "Value": "0-3"
     },
-    {
-      "PowerHint": "LAUNCH",
-      "Node": "UClampThreshold",
-      "Duration": 5000,
-      "Value": "0"
-    },
     {
       "PowerHint": "LAUNCH",
       "Node": "ReducePreferIdle",
diff --git a/powerhint-panther.json b/powerhint-panther.json
index c277a9f..3c1b93c 100644
--- a/powerhint-panther.json
+++ b/powerhint-panther.json
@@ -116,15 +116,6 @@
       ],
       "ResetOnInit": true
     },
-    {
-      "Name": "UClampThreshold",
-      "Path": "/proc/vendor_sched/uclamp_threshold",
-      "Values": [
-        "0",
-        "8"
-      ],
-      "ResetOnInit": true
-    },
     {
       "Name": "ReducePreferIdle",
       "Path": "/proc/vendor_sched/reduce_prefer_idle",
@@ -642,12 +633,6 @@
       "Duration": 1000,
       "Value": "0-3"
     },
-    {
-      "PowerHint": "LAUNCH",
-      "Node": "UClampThreshold",
-      "Duration": 5000,
-      "Value": "0"
-    },
     {
       "PowerHint": "LAUNCH",
       "Node": "ReducePreferIdle",