Cleanup whitespace

Cleanup whitespace as found by niceness gate

Change-Id: I96a51da18a4f4363d198bd6bbdb1fd1b9bbdb3b6
Merge "Cleanup whitespace"