Whitespace cleanup

Change-Id: I49417b95a6c4c2538715e09b74ed3607f6741c3a