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

Change-Id: Id4f363bfd90ce712df23a8028007d02cdd68ebbf