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

Change-Id: Ic814a2ff70dfca6f4268771750cbfedc7b116dc7