Fix issues in Wi-Fi NFC tag code

An NPE + multiple comments

Change-Id: I04ffe10874cc2e9aa9f68bc551b8da98eb6f1640
4 files changed