Remove NFC Enhanced

Change-Id: I19390f251e3d15756121b00653d103bc2b8ede19