Whitespace and capitalization cleanup

Change-Id: I9b7967d9da74b6f781415ff8af9019c86bd1311c
Merge "Whitespace and capitalization cleanup"