Revert "Revert "Revert "nfc: update default implementation to match style."""

This reverts commit 22be21e8647a587ee8f2effb57f38c793d90c2c5.

Change-Id: I0534b0eb87623091685fa0e2d94d744d2aeaa4ca
2 files changed