diff --git a/caiman/rro_overlays/UwbOverlay/Android.bp b/caiman/rro_overlays/UwbOverlay/Android.bp
new file mode 100644
index 00000000..db283b43
--- /dev/null
+++ b/caiman/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/caimito:device_google_caimito_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: [
+        "//device/google/caimito:device_google_caimito_license",
+    ],
+}
+
+runtime_resource_overlay {
+    name: "UwbOverlayCM4",
+    theme: "UwbOverlayCM4",
+    certificate: "platform",
+    sdk_version: "current",
+    product_specific: true,
+}
diff --git a/caiman/rro_overlays/UwbOverlay/AndroidManifest.xml b/caiman/rro_overlays/UwbOverlay/AndroidManifest.xml
new file mode 100644
index 00000000..216c3f16
--- /dev/null
+++ b/caiman/rro_overlays/UwbOverlay/AndroidManifest.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2024 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/caiman/rro_overlays/UwbOverlay/OWNERS b/caiman/rro_overlays/UwbOverlay/OWNERS
new file mode 100644
index 00000000..2395d7f0
--- /dev/null
+++ b/caiman/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/caiman/rro_overlays/UwbOverlay/res/values/config.xml b/caiman/rro_overlays/UwbOverlay/res/values/config.xml
new file mode 100644
index 00000000..315f18f2
--- /dev/null
+++ b/caiman/rro_overlays/UwbOverlay/res/values/config.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright (C) 2024 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>
+    <!-- When true, the filter engine will alter UWB values to improve accuracy. -->
+    <bool name="enable_filters">true</bool>
+
+    <!-- Enables the AoA conversion primer. This is needed on hardware that does not convert AoA
+    to spherical coordinates, including hardware that does not support elevation.-->
+    <bool name="enable_primer_aoa">true</bool>
+
+    <!-- Whether background ranging is enabled or not
+     If enabled:
+       * Background 3p apps are allowed to open new ranging sessions
+       * When previously foreground 3p apps moves to background, sessions are not terminated
+    -->
+    <bool name = "background_ranging_enabled">true</bool>
+
+    <!-- Whether multicast list update notification v2 is supported or not.
+     If enabled, the notification will be parsed into version 2 if uci major version is 2.0. -->
+    <bool name = "is_multicast_list_update_ntf_v2_supported">true</bool>
+</resources>
diff --git a/komodo/rro_overlays/UwbOverlay/res/values/config.xml b/komodo/rro_overlays/UwbOverlay/res/values/config.xml
index bf8d2640..de6d8c3c 100644
--- a/komodo/rro_overlays/UwbOverlay/res/values/config.xml
+++ b/komodo/rro_overlays/UwbOverlay/res/values/config.xml
@@ -30,4 +30,8 @@
        * When previously foreground 3p apps moves to background, sessions are not terminated
     -->
     <bool name = "background_ranging_enabled">true</bool>
+
+     <!-- Whether multicast list update notification v2 is supported or not.
+     If enabled, the notification will be parsed into version 2 if uci major version is 2.0. -->
+    <bool name = "is_multicast_list_update_ntf_v2_supported">true</bool>
 </resources>