Merge "NFC compatibility changes." into mnc-dev