Revert "Revert "nfc: reflect style guide."" am: 106bc9d27a
am: 22fa3244c7

Change-Id: I5bd5967521395f9979ebe7944960bea69840b444