Revert "Revert "Revert "nfc: update default implementation to match style."""
am: 6d4d412617

Change-Id: I0fdeaa060de1232ae43809ad3ae266e9b4cd67fd