Merge "Revert "Revert "Revert "update NfcAdaptation to match style.""""