Merge "Manta: NFC: enable error logging." into jb-mr1-dev