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

Change-Id: Ib00dd2e0051d2adb43d59269256b97d54dfa0b53