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

Change-Id: Id4f8a63dd22750ba5311e30e626876f0763447a9