Revert "nfc: reflect style guide."
am: 69bb15e06e

Change-Id: Ic511eb65f2a43a981e44d5df5c9c74c48d66bd26