Revert "Revert "nfc: reflect style guide.""

This reverts commit 69bb15e06eea6a0e437d388273c4810682393162.

Change-Id: Icd6ac819606c83e1518c4b6252f6416f55e618fd
4 files changed