diff --git a/rro_overlays/FrameworksOverlay/res/values/arrow_arrays.xml b/rro_overlays/FrameworksOverlay/res/values/arrow_arrays.xml
new file mode 100644
index 00000000..edfbc732
--- /dev/null
+++ b/rro_overlays/FrameworksOverlay/res/values/arrow_arrays.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2021 ArrowOS
+     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">
+
+    <!-- The list of components which should be automatically disabled for a specific device.
+         Note: this MUST not be used to randomly disable components, ask for approval first! -->
+    <string-array name="config_deviceDisabledComponents" translatable="false">
+        <item>com.google.android.gms/com.google.android.gms.nearby.discovery.service.DiscoveryService</item>
+        <item>com.google.android.gms/com.google.android.gms.nearby.messages.service.NearbyMessagesService</item>
+        <item>com.google.android.gms/com.google.android.gms.nearby.discovery.service.DiscoveryService</item>
+    </string-array>
+
+</resources>
diff --git a/rro_overlays/FrameworksOverlay/res/values/arrow_config.xml b/rro_overlays/FrameworksOverlay/res/values/arrow_config.xml
new file mode 100644
index 00000000..c6da9464
--- /dev/null
+++ b/rro_overlays/FrameworksOverlay/res/values/arrow_config.xml
@@ -0,0 +1,19 @@
+<!--
+     Copyright (C) 2018-2021 ArrowOS
+     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">
+
+    <!-- Is the battery LED intrusive? Used to decide if there should be a disable option -->
+    <bool name="config_intrusiveBatteryLed">true</bool>
+
+</resources>
diff --git a/rro_overlays/FrameworksOverlay/res/values/config.xml b/rro_overlays/FrameworksOverlay/res/values/config.xml
index a96ab15f..5fa3d9ee 100644
--- a/rro_overlays/FrameworksOverlay/res/values/config.xml
+++ b/rro_overlays/FrameworksOverlay/res/values/config.xml
@@ -791,9 +791,6 @@
         provisioning, availability etc -->
    <bool name="config_carrier_wfc_ims_available">true</bool>
 
-    <!-- Is the battery LED intrusive? Used to decide if there should be a disable option -->
-    <bool name="config_intrusiveBatteryLed">true</bool>
-
     <!-- Is the notification LED intrusive? Used to decide if there should be a disable option -->
     <bool name="config_intrusiveNotificationLed">true</bool>
 
@@ -976,27 +973,9 @@
          to have a confirmed way to dismiss the keyboard when desired. -->
     <bool name="config_automotiveHideNavBarForKeyboard">true</bool>
 
-    <!-- The list of components which should be automatically disabled for a specific device. -->
-    <string-array name="config_deviceDisabledComponents" translatable="false">
-        <item>com.google.android.gms/com.google.android.gms.nearby.discovery.service.DiscoveryService</item>
-        <item>com.google.android.gms/com.google.android.gms.nearby.messages.service.NearbyMessagesService</item>
-        <item>com.google.android.gms/com.google.android.gms.nearby.discovery.service.DiscoveryService</item>
-    </string-array>
-
     <!-- Configuration to enable non-default PDP during IWLAN -->
     <bool name="config_feature_iwlan_enabled">true</bool>
 
-    <!-- IWLAN data service package name to bind to by default. If none is specified in an overlay, an
-     empty string is passed in -->
-    <string translatable="false" name="config_wlan_data_service_package">vendor.qti.iwlan</string>
-
-    <!-- IWLAN network service package name to bind to by default. If none is specified in an overlay, an
-     empty string is passed in -->
-    <string translatable="false" name="config_wlan_network_service_package">vendor.qti.iwlan</string>
-
-    <!-- Telephony qualified networks service package name to bind to by default. -->
-    <string translatable="false" name="config_qualified_networks_service_package">vendor.qti.iwlan</string>
-
     <!-- Specify custom blanking delay of the display -->
     <integer name="config_screen_off_delay">0</integer>
 
diff --git a/rro_overlays/FrameworksOverlay/res/values/config_telephony.xml b/rro_overlays/FrameworksOverlay/res/values/config_telephony.xml
new file mode 100644
index 00000000..efa7b6cb
--- /dev/null
+++ b/rro_overlays/FrameworksOverlay/res/values/config_telephony.xml
@@ -0,0 +1,31 @@
+<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <!-- IWLAN data service package name to bind to by default. If none is specified in an overlay, an
+     empty string is passed in -->
+    <string translatable="false" name="config_wlan_data_service_package">vendor.qti.iwlan</string>
+
+    <!-- IWLAN network service package name to bind to by default. If none is specified in an overlay, an
+     empty string is passed in -->
+    <string translatable="false" name="config_wlan_network_service_package">vendor.qti.iwlan</string>
+
+    <!-- Telephony qualified networks service package name to bind to by default. -->
+    <string translatable="false" name="config_qualified_networks_service_package">vendor.qti.iwlan</string>
+
+</resources>