Revert "Revert "Revert "nfc: reflect style guide.""" am: 20ea4ea288
am: 77f08aaff0

Change-Id: I79257dc8ae23aca3a3bcb0c6ae45124f99a5ec8a