Merge "Revert "Revert "Revert "nfc: reflect style guide."""" am: 13e19421b3
am: 56fb3ee908

Change-Id: I1abaa6ab634c08a32d833dd4188754c52fe77b13