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

Change-Id: Icd1fa80cd7b9255743ac73b949015262a24ddb5e