Trailing whitespace cleanups

Change-Id: I8da0fbc488eb8447dc04d5d1f926a564cc67fc4a