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

Change-Id: Id5fe149c05b38408318b0c57ec47b0fe9d7f01f4