Trailing whitespace cleanups

Change-Id: Id17457e5709bc27e88748c53a199f0801a92f268