Fix whitespace

Fix issues noticed by checkniceness test.

Change-Id: Id6f04cdb986209923e25941d8a90cf033f28b6ed