Coding standards (whitespace and newlines, mainly). No actual code changes.
Merge "Coding standards (whitespace and newlines, mainly). No actual code changes."