Merge "Manta: NFC: Clean up configuration." into jb-mr1-dev