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

Change-Id: If444fe433f9e6034c33227a73b869b6cb6feda6f