Remove extra whitespace

Remove some end of line whitespace.

Change-Id: I18ff876f453839b3eb18a12a6be1e458c35c6008