diff --git a/cheetah/rro_overlays/NfcOverlay/res/values/config.xml b/cheetah/overlay/packages/apps/Nfc/res/values/config.xml
similarity index 100%
rename from cheetah/rro_overlays/NfcOverlay/res/values/config.xml
rename to cheetah/overlay/packages/apps/Nfc/res/values/config.xml
diff --git a/cheetah/rro_overlays/NfcOverlay/Android.bp b/cheetah/rro_overlays/NfcOverlay/Android.bp
deleted file mode 100644
index 83a878d..0000000
--- a/cheetah/rro_overlays/NfcOverlay/Android.bp
+++ /dev/null
@@ -1,9 +0,0 @@
-package {
- default_applicable_licenses: ["device_google_pantah_license"],
-}
-
-runtime_resource_overlay {
- name: "NfcOverlayCheetah",
- sdk_version: "current",
- product_specific: true
-}
diff --git a/cheetah/rro_overlays/NfcOverlay/AndroidManifest.xml b/cheetah/rro_overlays/NfcOverlay/AndroidManifest.xml
deleted file mode 100644
index 5241aa4..0000000
--- a/cheetah/rro_overlays/NfcOverlay/AndroidManifest.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
diff --git a/cheetah/rro_overlays/NfcOverlay/OWNERS b/cheetah/rro_overlays/NfcOverlay/OWNERS
deleted file mode 100644
index 35e9713..0000000
--- a/cheetah/rro_overlays/NfcOverlay/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-# Bug component: 48448
-include platform/packages/apps/Nfc:/OWNERS
diff --git a/device-cheetah.mk b/device-cheetah.mk
index 17d8400..f12c803 100644
--- a/device-cheetah.mk
+++ b/device-cheetah.mk
@@ -113,8 +113,7 @@ PRODUCT_COPY_FILES += \
PRODUCT_PACKAGES += \
NfcNci \
Tag \
- android.hardware.nfc-service.st \
- NfcOverlayCheetah
+ android.hardware.nfc-service.st
# SecureElement
PRODUCT_PACKAGES += \
diff --git a/device-panther.mk b/device-panther.mk
index 4c2ed9d..8d8099c 100644
--- a/device-panther.mk
+++ b/device-panther.mk
@@ -92,8 +92,7 @@ PRODUCT_COPY_FILES += \
PRODUCT_PACKAGES += \
NfcNci \
Tag \
- android.hardware.nfc-service.st \
- NfcOverlayPanther
+ android.hardware.nfc-service.st
# SecureElement
PRODUCT_PACKAGES += \
diff --git a/panther/rro_overlays/NfcOverlay/res/values/config.xml b/panther/overlay/packages/apps/Nfc/res/values/config.xml
similarity index 100%
rename from panther/rro_overlays/NfcOverlay/res/values/config.xml
rename to panther/overlay/packages/apps/Nfc/res/values/config.xml
diff --git a/panther/rro_overlays/NfcOverlay/Android.bp b/panther/rro_overlays/NfcOverlay/Android.bp
deleted file mode 100644
index a1d3b96..0000000
--- a/panther/rro_overlays/NfcOverlay/Android.bp
+++ /dev/null
@@ -1,9 +0,0 @@
-package {
- default_applicable_licenses: ["device_google_pantah_license"],
-}
-
-runtime_resource_overlay {
- name: "NfcOverlayPanther",
- sdk_version: "current",
- product_specific: true
-}
diff --git a/panther/rro_overlays/NfcOverlay/AndroidManifest.xml b/panther/rro_overlays/NfcOverlay/AndroidManifest.xml
deleted file mode 100644
index 5241aa4..0000000
--- a/panther/rro_overlays/NfcOverlay/AndroidManifest.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
diff --git a/panther/rro_overlays/NfcOverlay/OWNERS b/panther/rro_overlays/NfcOverlay/OWNERS
deleted file mode 100644
index 35e9713..0000000
--- a/panther/rro_overlays/NfcOverlay/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-# Bug component: 48448
-include platform/packages/apps/Nfc:/OWNERS