diff --git a/device.mk b/device.mk
index 8eb9007..f6fa1ed 100644
--- a/device.mk
+++ b/device.mk
@@ -56,9 +56,34 @@ PRODUCT_PACKAGES += \
 
 # Permissions
 PRODUCT_COPY_FILES += \
+    frameworks/native/data/etc/android.hardware.nfc.hce.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.hce.xml \
     frameworks/native/data/etc/android.hardware.nfc.hcef.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.hcef.xml \
+    frameworks/native/data/etc/android.hardware.nfc.uicc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.uicc.xml \
+    frameworks/native/data/etc/android.hardware.nfc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.xml \
     frameworks/native/data/etc/com.nxp.mifare.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.nxp.mifare.xml
 
+DEVICE_SKUS := b d f
+
+PRODUCT_COPY_FILES += \
+$(foreach DEVICE_SKU, $(DEVICE_SKUS), \
+    $(LOCAL_PATH)/permissions/unavail.android.hardware.nfc.hce.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_$(DEVICE_SKU)/unavail.android.hardware.nfc.hce.xml \
+    $(LOCAL_PATH)/permissions/unavail.android.hardware.nfc.hcef.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_$(DEVICE_SKU)/unavail.android.hardware.nfc.hcef.xml \
+    $(LOCAL_PATH)/permissions/unavail.android.hardware.nfc.uicc.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_$(DEVICE_SKU)/unavail.android.hardware.nfc.uicc.xml \
+    $(LOCAL_PATH)/permissions/unavail.android.hardware.nfc.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_$(DEVICE_SKU)/unavail.android.hardware.nfc.xml \
+    $(LOCAL_PATH)/permissions/unavail.android.hardware.se.omapi.ese.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_$(DEVICE_SKU)/unavail.android.hardware.se.omapi.ese.xml)
+
+ESE_DEVICE_SKUS := de
+
+PRODUCT_COPY_FILES += \
+$(foreach DEVICE_SKU, $(ESE_DEVICE_SKUS), \
+    frameworks/native/data/etc/android.hardware.se.omapi.ese.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_$(ESE_DEVICE_SKU)/android.hardware.se.omapi.ese.xml)
+
+NFC_DEVICE_SKUS := dn n
+
+PRODUCT_COPY_FILES += \
+$(foreach DEVICE_SKU, $(NFC_DEVICE_SKUS), \
+    $(LOCAL_PATH)/permissions/unavail.android.hardware.se.omapi.ese.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_$(DEVICE_SKU)/unavail.android.hardware.se.omapi.ese.xml)
+
 # Sensors
 PRODUCT_PACKAGES += \
     sensors.bangkk
diff --git a/permissions/unavail.android.hardware.nfc.hce.xml b/permissions/unavail.android.hardware.nfc.hce.xml
new file mode 100644
index 0000000..d51b477
--- /dev/null
+++ b/permissions/unavail.android.hardware.nfc.hce.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<permissions>
+    <unavailable-feature name="android.hardware.nfc.hce"/>
+</permissions>
diff --git a/permissions/unavail.android.hardware.nfc.hcef.xml b/permissions/unavail.android.hardware.nfc.hcef.xml
new file mode 100644
index 0000000..52dfb76
--- /dev/null
+++ b/permissions/unavail.android.hardware.nfc.hcef.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<permissions>
+    <unavailable-feature name="android.hardware.nfc.hcef"/>
+</permissions>
diff --git a/permissions/unavail.android.hardware.nfc.uicc.xml b/permissions/unavail.android.hardware.nfc.uicc.xml
new file mode 100644
index 0000000..bbf821d
--- /dev/null
+++ b/permissions/unavail.android.hardware.nfc.uicc.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<permissions>
+    <unavailable-feature name="android.hardware.nfc.uicc"/>
+</permissions>
diff --git a/permissions/unavail.android.hardware.nfc.xml b/permissions/unavail.android.hardware.nfc.xml
new file mode 100644
index 0000000..62f0548
--- /dev/null
+++ b/permissions/unavail.android.hardware.nfc.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<permissions>
+    <unavailable-feature name="android.hardware.nfc"/>
+    <unavailable-feature name="android.hardware.nfc.any"/>
+</permissions>
diff --git a/permissions/unavail.android.hardware.se.omapi.ese.xml b/permissions/unavail.android.hardware.se.omapi.ese.xml
new file mode 100644
index 0000000..66bf79d
--- /dev/null
+++ b/permissions/unavail.android.hardware.se.omapi.ese.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<permissions>
+    <unavailable-feature name="android.hardware.se.omapi.ese"/>
+</permissions>