diff --git a/device-caiman.mk b/device-caiman.mk
index edfc7ef1..0b897c12 100644
--- a/device-caiman.mk
+++ b/device-caiman.mk
@@ -395,3 +395,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
 
 # Window Extensions
 $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk)
+
+# Connectivity Resources Overlay
+PRODUCT_PACKAGES += \
+    ConnectivityResourcesOverlayCaimitoOverride
diff --git a/device-komodo.mk b/device-komodo.mk
index e7044168..1c044377 100644
--- a/device-komodo.mk
+++ b/device-komodo.mk
@@ -396,3 +396,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk)
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
 $(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
 endif
+
+# Connectivity Resources Overlay
+PRODUCT_PACKAGES += \
+    ConnectivityResourcesOverlayCaimitoOverride
diff --git a/device-tokay.mk b/device-tokay.mk
index 1168ddf5..2a8c8582 100644
--- a/device-tokay.mk
+++ b/device-tokay.mk
@@ -366,3 +366,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk)
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
 $(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
 endif
+
+# Connectivity Resources Overlay
+PRODUCT_PACKAGES += \
+    ConnectivityResourcesOverlayCaimitoOverride
diff --git a/rro_overlays/ConnectivityResourcesOverlayCaimito/Android.bp b/rro_overlays/ConnectivityResourcesOverlayCaimito/Android.bp
new file mode 100644
index 00000000..7c3e4605
--- /dev/null
+++ b/rro_overlays/ConnectivityResourcesOverlayCaimito/Android.bp
@@ -0,0 +1,33 @@
+//
+// 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.
+//
+
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+runtime_resource_overlay {
+    name: "ConnectivityResourcesOverlayCaimito",
+    sdk_version: "current",
+    product_specific: true,
+    resource_dirs: ["res"],
+}
+
+override_runtime_resource_overlay {
+    name: "ConnectivityResourcesOverlayCaimitoOverride",
+    base: "ConnectivityResourcesOverlayCaimito",
+    package_name: "com.google.android.connectivity.resources.caimito",
+    target_package_name: "com.google.android.connectivity.resources",
+}
diff --git a/rro_overlays/ConnectivityResourcesOverlayCaimito/AndroidManifest.xml b/rro_overlays/ConnectivityResourcesOverlayCaimito/AndroidManifest.xml
new file mode 100644
index 00000000..9bd63d5b
--- /dev/null
+++ b/rro_overlays/ConnectivityResourcesOverlayCaimito/AndroidManifest.xml
@@ -0,0 +1,25 @@
+<?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.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.google.android.connectivity.resources.caimito">
+    <application android:hasCode="false" />
+    <overlay android:targetPackage="com.android.connectivity.resources"
+             android:targetName="ServiceConnectivityResourcesConfig"
+             android:isStatic="true"
+             android:priority="0" />
+</manifest>
diff --git a/rro_overlays/ConnectivityResourcesOverlayCaimito/res/values/config.xml b/rro_overlays/ConnectivityResourcesOverlayCaimito/res/values/config.xml
new file mode 100644
index 00000000..9300b860
--- /dev/null
+++ b/rro_overlays/ConnectivityResourcesOverlayCaimito/res/values/config.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <bool name="config_thread_default_enabled">false</bool>
+</resources>