Remove NFC from master

Change-Id: I74c3df9e5d226f99cb740b60ae990cc8ad0a2fca