NFC Enhanced

Change-Id: If2310e4a598c1d94739bc4cb8aadc4ae22d8c8d3