Track our own Nfc

Change-Id: I396a5b3d311f8656b8728ee02dbd437540e17d79
Merge remote-tracking branch 'ls/kitkat'