Remove all trailing whitespace

Change-Id: I9d2b36a2336494e695a6b44ff619b13c8e80e397
Merge "Remove all trailing whitespace"