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

Change-Id: Ic96a927babcb05643e5f75eaafbf5d6c72c53b0e