Cleanup whitespace

Change-Id: Iec265e4273368f03d430e70246824705dd6d4200
Merge "Cleanup whitespace"