Revert "nfc: reflect style guide." am: 69bb15e06e am: 523f7fc318
am: d61bc26a53

Change-Id: I072343f221a302b97eb6ae9104ca43c8aa573807