Fix whitespace issues

Remove extra space and tabs.

Change-Id: I6568a961a667fad1ddefe7322d833837693457ba
Merge "Fix whitespace issues"