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

This reverts commit 106bc9d27a271b316ce3b4237d59a908c23a4ec0.

Change-Id: Ie2e0ad4aeaa58c45bab05234615bd7fa02b84c1a
4 files changed