NFC support
Merge remote-tracking branch 'origin/ics' into b2g