Merge "update NfcAdaptation to match style."