Bug 1023288 - NFC configuration is not working correctly in variant.json file.
Merge pull request #20370 from acperez/bug-1023288

Bug 1023288 - NFC configuration is not working correctly in variant.json file.