Merge remote-tracking branch 'origin/QCM6490.LA.3.0_T' into fp5-0324

Change-Id: I896d9bab782c61e545116627b4ea40b91230e321
diff --git a/nfc_system_product.mk b/nfc_system_product.mk
index 0a59ef3..a401197 100644
--- a/nfc_system_product.mk
+++ b/nfc_system_product.mk
@@ -1,3 +1,4 @@
+ifeq (0,1)
 ifeq ($(TARGET_FWK_SUPPORTS_FULL_VALUEADDS), true)
 TARGET_USES_QSSI_NQ_NFC := true
 
@@ -15,3 +16,5 @@
 PRODUCT_PACKAGES += $(NQ_SYSTEM_NFC)
 endif
 endif
+endif
+