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

Change-Id: I69dc6f064c79e3a08b06c1cacb03691cdb83f1fc