diff --git a/resource-overlay/common/Wifi/res/values/config.xml b/resource-overlay/common/Wifi/res/values/config.xml
index c43a608..2d43035 100644
--- a/resource-overlay/common/Wifi/res/values/config.xml
+++ b/resource-overlay/common/Wifi/res/values/config.xml
@@ -62,4 +62,7 @@
 
     <!-- integer indicating additional disconnect delay (in ms) after IMS onLost() indication is received -->
     <integer translatable="false" name="config_wifiDelayDisconnectOnImsLostMs">1000</integer>
+
+	<!-- Boolean indicating whether 802.11r Fast BSS Transition is enabled on this platform -->
+	<bool name="config_wifi_fast_bss_transition_enabled">true</bool>
 </resources>
diff --git a/rro_overlays/WifiResCommon/Android.bp b/rro_overlays/WifiResCommon/Android.bp
deleted file mode 100644
index 859ad2b..0000000
--- a/rro_overlays/WifiResCommon/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-runtime_resource_overlay {
-    name: "WifiResCommon",
-    theme: "WifiResCommon",
-    sdk_version: "current",
-    product_specific: true
-}
diff --git a/rro_overlays/WifiResCommon/AndroidManifest.xml b/rro_overlays/WifiResCommon/AndroidManifest.xml
deleted file mode 100644
index eb771d3..0000000
--- a/rro_overlays/WifiResCommon/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.wifi.resources.overlay.common"
-    android:versionCode="1"
-    android:versionName="1.0">
-    <application android:hasCode="false" />
-    <overlay
-      android:targetPackage="com.android.wifi.resources"
-      android:targetName="WifiCustomization"
-      android:isStatic="true"
-      android:priority="0"/>
-</manifest>
diff --git a/rro_overlays/WifiResCommon/res/values/bools.xml b/rro_overlays/WifiResCommon/res/values/bools.xml
deleted file mode 100644
index f595ea4..0000000
--- a/rro_overlays/WifiResCommon/res/values/bools.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- boolean indicating whether the WiFi chipset has 5GHz band support.
-         Note: This config is replacing the config_wifi_dual_band_support
-         since more bands may now be supported (such as 6GHz), the naming dual_band
-         is no longer indicative, and a separate config now exists for each band -->
-    <bool name="config_wifi5ghzSupport">true</bool>
-
-    <!-- Wifi driver Automatic channel selection (ACS) for softap to include DFS channels -->
-    <bool name="config_wifiSoftapAcsIncludeDfs">true</bool>
-
-    <!-- Boolean indicating whether the wifi chipset supports background scanning mechanism.
-         This mechanism allows the host to remain in suspend state and the dongle to actively
-         scan and wake the host when a configured SSID is detected by the dongle. This chipset
-         capability can provide power savings when wifi needs to be always kept on. -->
-    <bool name="config_wifi_background_scan_support">true</bool>
-
-    <!-- Indicates that connected MAC randomization is supported on this device -->
-    <bool name="config_wifi_connected_mac_randomization_supported">true</bool>
-
-    <!-- Indicates that p2p MAC randomization is supported on this device -->
-    <bool name="config_wifi_p2p_mac_randomization_supported">true</bool>
-
-    <!-- Wifi driver supports Automatic channel selection (ACS) for softap -->
-    <bool name="config_wifi_softap_acs_supported">true</bool>
-
-    <!-- Wifi driver supports IEEE80211AC for softap -->
-    <bool name="config_wifi_softap_ieee80211ac_supported">true</bool>
-
-    <!-- Wifi driver supports WPA3 Simultaneous Authentication of Equals (WPA3-SAE) for softap -->
-    <bool name="config_wifi_softap_sae_supported">true</bool>
-
-    <!-- Wifi driver supports IEEE80211AX for softap -->
-	<bool name="config_wifiSoftapIeee80211axSupported">true</bool>
-
-	<!-- Wifi driver supports IEEE80211AX single user beamformee for softap -->
-	<bool name="config_wifiSoftapHeSuBeamformeeSupported">true</bool>
-
-	<!-- Wifi driver supports IEEE80211AX single user beamformer for softap -->
-    <bool name="config_wifiSoftapHeSuBeamformerSupported">true</bool>
-
-	<!-- Boolean indicating whether 802.11r Fast BSS Transition is enabled on this platform -->
-	<bool name="config_wifi_fast_bss_transition_enabled">true</bool>
-</resources>
diff --git a/rro_overlays/WifiResCommon/res/values/integers.xml b/rro_overlays/WifiResCommon/res/values/integers.xml
deleted file mode 100644
index ab57c9e..0000000
--- a/rro_overlays/WifiResCommon/res/values/integers.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Integer indicating maximum hardware supported client number of soft ap -->
-    <integer name="config_wifiHardwareSoftapMaxClientCount">32</integer>
-</resources>
diff --git a/rro_overlays/WifiResCommon/res/values/strings.xml b/rro_overlays/WifiResCommon/res/values/strings.xml
deleted file mode 100644
index b53a931..0000000
--- a/rro_overlays/WifiResCommon/res/values/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- List of allowed channels in 2GHz band for softap. If the device doesn't want to restrict
-         channels this should be empty. Values is a comma separated channel string and/or channel
-         range string like '1-6,11'. -->
-    <string name="config_wifiSoftap2gChannelList"></string>
-</resources>