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