diff --git a/BoardConfig.mk b/BoardConfig.mk
index 21ad64e..7803f4d 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -98,6 +98,9 @@ LOC_HIDL_VERSION := 3.0
 # HIDL
 DEVICE_MANIFEST_FILE := $(DEVICE_PATH)/configs/hidl/manifest.xml
 DEVICE_MATRIX_FILE := $(DEVICE_PATH)/configs/hidl/compatibility_matrix.xml
+ODM_MANIFEST_SKUS += davinci
+ODM_MANIFEST_DAVINCI_FILES := \
+    $(DEVICE_PATH)/configs/hidl/manifest-nfc.xml
 
 # Init
 TARGET_INIT_VENDOR_LIB := //$(DEVICE_PATH):libinit_davinci
diff --git a/configs/hidl/manifest-nfc.xml b/configs/hidl/manifest-nfc.xml
new file mode 100644
index 0000000..2d101a0
--- /dev/null
+++ b/configs/hidl/manifest-nfc.xml
@@ -0,0 +1,22 @@
+<manifest version="1.0" type="device">
+    <hal format="hidl">
+        <name>android.hardware.nfc</name>
+        <transport>hwbinder</transport>
+        <version>1.2</version>
+        <interface>
+            <name>INfc</name>
+            <instance>default</instance>
+        </interface>
+        <fqname>@1.2::INfc/default</fqname>
+    </hal>
+    <hal format="hidl">
+        <name>vendor.nxp.hardware.nfc</name>
+        <transport>hwbinder</transport>
+        <version>1.2</version>
+        <interface>
+            <name>INqNfc</name>
+            <instance>default</instance>
+        </interface>
+        <fqname>@1.2::INqNfc/default</fqname>
+    </hal>
+</manifest>
diff --git a/configs/hidl/manifest.xml b/configs/hidl/manifest.xml
index d449ecd..ddd7c1b 100644
--- a/configs/hidl/manifest.xml
+++ b/configs/hidl/manifest.xml
@@ -223,16 +223,6 @@
         <fqname>@1.2::IDevice/qti-gpu</fqname>
         <fqname>@1.2::IDevice/qti-hta</fqname>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.nfc</name>
-        <transport>hwbinder</transport>
-        <version>1.2</version>
-        <interface>
-            <name>INfc</name>
-            <instance>default</instance>
-        </interface>
-        <fqname>@1.2::INfc/default</fqname>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.power</name>
         <transport>hwbinder</transport>
@@ -449,16 +439,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>vendor.nxp.hardware.nfc</name>
-        <transport>hwbinder</transport>
-        <version>1.2</version>
-        <interface>
-            <name>INqNfc</name>
-            <instance>default</instance>
-        </interface>
-        <fqname>@1.2::INqNfc/default</fqname>
-    </hal>
     <hal format="hidl">
         <name>vendor.qti.data.factory</name>
         <transport>hwbinder</transport>
diff --git a/rootdir/etc/init.target.rc b/rootdir/etc/init.target.rc
index 8608793..f1aa35d 100644
--- a/rootdir/etc/init.target.rc
+++ b/rootdir/etc/init.target.rc
@@ -59,6 +59,12 @@ on init
     chmod 0660 /dev/drv8846_dev
     chmod 0660 /dev/akm09970
 
+on init && property:ro.boot.hwc=GLOBAL
+    setprop ro.boot.product.hardware.sku davinci
+
+on init && property:ro.boot.hwc=CN
+    setprop ro.boot.product.hardware.sku davinci
+
 on fs
     mount_all /vendor/etc/fstab.qcom --early