Also removed some trailing whitespace. Change-Id: I40bf4f776ca4d467b7ee6f2c9a7500c13700f9d5
Tested on: Windows, Unit Tests