Revert "Revert "Revert "nfc: reflect style guide."""
am: 20ea4ea288

Change-Id: I1113a2fb4d8647f11d5269ea59a487fa5466945f