Remove trailing whitespace

Change-Id: Iff9619b77154eb92f471d16626a604dc2279c174
Merge "Remove trailing whitespace"