diff --git a/holi.mk b/holi.mk
index fde39df..2223c49 100644
--- a/holi.mk
+++ b/holi.mk
@@ -349,6 +349,7 @@ PRODUCT_PACKAGES += \
 
 # RIL
 PRODUCT_PACKAGES += \
+    CarrierConfigOverlay \
     libjson \
     librmnetctl
 
diff --git a/rro_overlays/CarrierConfigOverlay/Android.bp b/rro_overlays/CarrierConfigOverlay/Android.bp
new file mode 100644
index 0000000..8864ba7
--- /dev/null
+++ b/rro_overlays/CarrierConfigOverlay/Android.bp
@@ -0,0 +1,7 @@
+runtime_resource_overlay {
+    name: "CarrierConfigOverlay",
+    theme: "CarrierConfigOverlay",
+    sdk_version: "current",
+    product_specific: true,
+    aaptflags: ["--keep-raw-values"],
+}
diff --git a/rro_overlays/CarrierConfigOverlay/AndroidManifest.xml b/rro_overlays/CarrierConfigOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..b19082c
--- /dev/null
+++ b/rro_overlays/CarrierConfigOverlay/AndroidManifest.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2019 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.
+-->
+<!-- Xiaomi sm8350 specific carrier overlays -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.carrierconfig.xiaomi_sm8350"
+    android:versionCode="1"
+    android:versionName="1.0">
+    <application android:hasCode="false" />
+    <overlay
+      android:targetPackage="com.android.carrierconfig"
+      android:isStatic="true"
+      android:priority="0"/>
+</manifest>
diff --git a/overlay/packages/apps/CarrierConfig/res/xml/vendor.xml b/rro_overlays/CarrierConfigOverlay/res/xml/vendor.xml
similarity index 100%
rename from overlay/packages/apps/CarrierConfig/res/xml/vendor.xml
rename to rro_overlays/CarrierConfigOverlay/res/xml/vendor.xml