Merge "Add NFC support into QC"