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

This reverts commit 3768be324bc81b04f4a3a9dfbbe3324dc13cc5f0.

Change-Id: Ifecd3ac227af14b49eba83c1126d51996ce3b8f5
2 files changed