Merge "Fix issues in Wi-Fi NFC tag code"