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

Change-Id: I062cab50c506f42c1686275dc21c7052613e800f