Revert "Revert "nfc: reflect style guide.""
am: 106bc9d27a

Change-Id: I0d29f4064a8b4fc84fe5d3a4d09d94ad9854cccb