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

Change-Id: I383cbfde9f5812fa0af02cc6419d25aea08ca4d5