Whitespace: remove some

Change-Id: I395d8149bb2251625d77d795f851954a59b2b441