Whitespace cleanup to match coding conventions

Split off from I006ffbe7.

Change-Id: I3d432286ef6756cecb49bd065d33a25e9955dcdd