Merge "Revert "nfc: reflect style guide."" am: ea4b569fee
am: a2bdc9d012

Change-Id: Idbf1e89939936e3d62df7f565388a9a92922ccc2