Fix whitespace

Fix issues found by niceness check.

Change-Id: I76a71680e1a3b0388c8351d2bc0311d1ad9e5a73