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

Change-Id: Iaa4cd7b87ab3905d345345e100d6ee51e38f7871