use nfc enhanced

Change-Id: I87682f02f0f1209828bcbd364149be24cf938c67