zenfone6: Overrides few system property

Change-Id: Iba0e73407e95c4b649684271c9107501032c7f40
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 6f0618d..a2f4652 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -130,9 +130,6 @@
 # NFC
 TARGET_USES_NQ_NFC := true
 
-# OTA
-TARGET_OTA_ASSERT_DEVICE := WW_I01WD
-
 # Partitions
 BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
 BOARD_BOOTIMAGE_PARTITION_SIZE := 100663296
diff --git a/omni_zenfone6.mk b/omni_zenfone6.mk
index 4cd55c7..430ca50 100644
--- a/omni_zenfone6.mk
+++ b/omni_zenfone6.mk
@@ -52,6 +52,11 @@
 OMNI_PRODUCT_PROPERTIES += \
     ro.build.product=ZS630KL
 
+PRODUCT_BUILD_PROP_OVERRIDES += \
+    PRODUCT_DEVICE=ASUS_I01WD \
+    PRODUCT_NAME=WW_I01WD \
+    TARGET_DEVICE=ZS630KL
+
 VENDOR_RELEASE := 11/RKQ1.200710.002/18.0610.2011.107-0:user/release-keys
 BUILD_FINGERPRINT := asus/WW_I01WD/ASUS_I01WD:$(VENDOR_RELEASE)
 OMNI_BUILD_FINGERPRINT := asus/WW_I01WD/ASUS_I01WD:$(VENDOR_RELEASE)