Revert "nfc: update default implementation to match style." am: 3768be324b
am: a9f5e70913

Change-Id: Ie64fbc8d4975684e11e9eda797470ea780dffc55