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