NFC Enhanced

Change-Id: Ide8ee106be538dbfe138f90bacc356d5b5faaccf