diff --git a/caiman/rro_overlays/NfcOverlay/Android.bp b/caiman/rro_overlays/NfcOverlay/Android.bp
new file mode 100644
index 00000000..c0982559
--- /dev/null
+++ b/caiman/rro_overlays/NfcOverlay/Android.bp
@@ -0,0 +1,9 @@
+package {
+ default_applicable_licenses: ["device_google_caimito_license"],
+}
+
+runtime_resource_overlay {
+ name: "NfcOverlayCaiman",
+ sdk_version: "current",
+ product_specific: true
+}
diff --git a/caiman/rro_overlays/NfcOverlay/AndroidManifest.xml b/caiman/rro_overlays/NfcOverlay/AndroidManifest.xml
new file mode 100644
index 00000000..5241aa4a
--- /dev/null
+++ b/caiman/rro_overlays/NfcOverlay/AndroidManifest.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
diff --git a/caiman/rro_overlays/NfcOverlay/OWNERS b/caiman/rro_overlays/NfcOverlay/OWNERS
new file mode 100644
index 00000000..35e9713f
--- /dev/null
+++ b/caiman/rro_overlays/NfcOverlay/OWNERS
@@ -0,0 +1,2 @@
+# Bug component: 48448
+include platform/packages/apps/Nfc:/OWNERS
diff --git a/caiman/rro_overlays/NfcOverlay/res/values/config.xml b/caiman/rro_overlays/NfcOverlay/res/values/config.xml
new file mode 100644
index 00000000..5058cfa5
--- /dev/null
+++ b/caiman/rro_overlays/NfcOverlay/res/values/config.xml
@@ -0,0 +1,25 @@
+
+
+
+ false
+ true
+
+ - GR83Y
+ - GEC77
+ - GWVK6
+
+ true
+
diff --git a/device-caiman.mk b/device-caiman.mk
index b8cbcfa1..f838e2f3 100644
--- a/device-caiman.mk
+++ b/device-caiman.mk
@@ -67,7 +67,8 @@ PRODUCT_COPY_FILES += \
PRODUCT_PACKAGES += \
$(RELEASE_PACKAGE_NFC_STACK) \
Tag \
- android.hardware.nfc-service.st
+ android.hardware.nfc-service.st \
+ NfcOverlayCaiman
# SecureElement
PRODUCT_PACKAGES += \
diff --git a/device-komodo.mk b/device-komodo.mk
index 49a0acfa..378837ac 100644
--- a/device-komodo.mk
+++ b/device-komodo.mk
@@ -82,7 +82,8 @@ PRODUCT_COPY_FILES += \
PRODUCT_PACKAGES += \
$(RELEASE_PACKAGE_NFC_STACK) \
Tag \
- android.hardware.nfc-service.st
+ android.hardware.nfc-service.st \
+ NfcOverlayKomodo
# SecureElement
PRODUCT_PACKAGES += \
diff --git a/device-tokay.mk b/device-tokay.mk
index 886a6879..11d70793 100644
--- a/device-tokay.mk
+++ b/device-tokay.mk
@@ -73,7 +73,8 @@ PRODUCT_COPY_FILES += \
PRODUCT_PACKAGES += \
$(RELEASE_PACKAGE_NFC_STACK) \
Tag \
- android.hardware.nfc-service.st
+ android.hardware.nfc-service.st \
+ NfcOverlayTokay
# SecureElement
PRODUCT_PACKAGES += \
diff --git a/komodo/rro_overlays/NfcOverlay/Android.bp b/komodo/rro_overlays/NfcOverlay/Android.bp
new file mode 100644
index 00000000..8e19ae4b
--- /dev/null
+++ b/komodo/rro_overlays/NfcOverlay/Android.bp
@@ -0,0 +1,9 @@
+package {
+ default_applicable_licenses: ["device_google_caimito_license"],
+}
+
+runtime_resource_overlay {
+ name: "NfcOverlayKomodo",
+ sdk_version: "current",
+ product_specific: true
+}
diff --git a/komodo/rro_overlays/NfcOverlay/AndroidManifest.xml b/komodo/rro_overlays/NfcOverlay/AndroidManifest.xml
new file mode 100644
index 00000000..5241aa4a
--- /dev/null
+++ b/komodo/rro_overlays/NfcOverlay/AndroidManifest.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
diff --git a/komodo/rro_overlays/NfcOverlay/OWNERS b/komodo/rro_overlays/NfcOverlay/OWNERS
new file mode 100644
index 00000000..35e9713f
--- /dev/null
+++ b/komodo/rro_overlays/NfcOverlay/OWNERS
@@ -0,0 +1,2 @@
+# Bug component: 48448
+include platform/packages/apps/Nfc:/OWNERS
diff --git a/komodo/rro_overlays/NfcOverlay/res/values/config.xml b/komodo/rro_overlays/NfcOverlay/res/values/config.xml
new file mode 100644
index 00000000..265f2c9a
--- /dev/null
+++ b/komodo/rro_overlays/NfcOverlay/res/values/config.xml
@@ -0,0 +1,25 @@
+
+
+
+ false
+ true
+
+ - GGX8B
+ - GQ57S
+ - GZC4K
+
+ true
+
diff --git a/tokay/rro_overlays/NfcOverlay/Android.bp b/tokay/rro_overlays/NfcOverlay/Android.bp
new file mode 100644
index 00000000..187416bf
--- /dev/null
+++ b/tokay/rro_overlays/NfcOverlay/Android.bp
@@ -0,0 +1,9 @@
+package {
+ default_applicable_licenses: ["device_google_caimito_license"],
+}
+
+runtime_resource_overlay {
+ name: "NfcOverlayTokay",
+ sdk_version: "current",
+ product_specific: true
+}
diff --git a/tokay/rro_overlays/NfcOverlay/AndroidManifest.xml b/tokay/rro_overlays/NfcOverlay/AndroidManifest.xml
new file mode 100644
index 00000000..5241aa4a
--- /dev/null
+++ b/tokay/rro_overlays/NfcOverlay/AndroidManifest.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
diff --git a/tokay/rro_overlays/NfcOverlay/OWNERS b/tokay/rro_overlays/NfcOverlay/OWNERS
new file mode 100644
index 00000000..35e9713f
--- /dev/null
+++ b/tokay/rro_overlays/NfcOverlay/OWNERS
@@ -0,0 +1,2 @@
+# Bug component: 48448
+include platform/packages/apps/Nfc:/OWNERS
diff --git a/tokay/rro_overlays/NfcOverlay/res/values/config.xml b/tokay/rro_overlays/NfcOverlay/res/values/config.xml
new file mode 100644
index 00000000..5d908286
--- /dev/null
+++ b/tokay/rro_overlays/NfcOverlay/res/values/config.xml
@@ -0,0 +1,25 @@
+
+
+
+ false
+ true
+
+ - G2YBB
+ - GUR25
+ - G1B60
+
+ true
+