Cleanup trailing whitespace

Change-Id: I5c654af1f8d3acdb13624b790caf21ffabf3d8f8