Remove trailing whitespace

Change-Id: I170bb9cb99f7d9736f22a6418c6accb2a67c4668
Merge "Remove trailing whitespace"