Merge "Revert "Revert "nfc: update default implementation to match style.""" am: 67f700350a am: 4484643519 am: 3313147682
am: c5e08ba085

Change-Id: I0b2992184b936089345d56352ca4b963429d40ca