diff --git a/rro_overlays/TetheringOverlay/Android.bp b/rro_overlays/TetheringOverlay/Android.bp
new file mode 100644
index 0000000..9388c59
--- /dev/null
+++ b/rro_overlays/TetheringOverlay/Android.bp
@@ -0,0 +1,22 @@
+//
+// Copyright (C) 2020 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.
+//
+
+runtime_resource_overlay {
+    name: "TetheringConfigOverlay",
+    resource_dirs: ["res"],
+    sdk_version: "current",
+    product_specific: true
+}
diff --git a/rro_overlays/TetheringOverlay/AndroidManifest.xml b/rro_overlays/TetheringOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..b349a84
--- /dev/null
+++ b/rro_overlays/TetheringOverlay/AndroidManifest.xml
@@ -0,0 +1,11 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.networkstack.tethering.samsung_universal8890"
+    android:versionCode="1"
+    android:versionName="1.0">
+    <application android:hasCode="false" />
+    <overlay
+      android:targetPackage="com.android.networkstack.tethering"
+      android:targetName="TetheringConfig"
+      android:isStatic="true"
+      android:priority="0"/>
+</manifest>
diff --git a/overlay/frameworks/base/packages/Tethering/res/values/config.xml b/rro_overlays/TetheringOverlay/res/values/config.xml
similarity index 88%
rename from overlay/frameworks/base/packages/Tethering/res/values/config.xml
rename to rro_overlays/TetheringOverlay/res/values/config.xml
index 3e591fb..da4c23f 100644
--- a/overlay/frameworks/base/packages/Tethering/res/values/config.xml
+++ b/rro_overlays/TetheringOverlay/res/values/config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <bool translatable="false" name="config_tether_enable_bpf_offload">false</bool>
     <string-array translatable="false" name="config_tether_usb_regexs">
         <item>"rndis\\d"</item>
diff --git a/universal7904-common.mk b/universal7904-common.mk
index 78e8d8e..9f8244d 100644
--- a/universal7904-common.mk
+++ b/universal7904-common.mk
@@ -73,6 +73,10 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     lineage.touch@1.0-service.samsung
 
+# Wifi
+PRODUCT_PACKAGES += \
+    TetheringConfigOverlay
+
 # VNDK
 PRODUCT_EXTRA_VNDK_VERSIONS := 29