Revert "nfc: reflect style guide."

This reverts commit e0c416a6f247992089663095f29a9e50cef2ef99.

Change-Id: I3fec772343d88a29225aef61bb549fef8ac9b797
4 files changed