Goodbye NFC

Change-Id: I804e882a9c4f92e8dd4182eb69925eb5f367b633