Update formatting

Remove inline tabs and superfluous whitespace.

Change-Id: If9d1c3fd2aa132f9dfd2f19258d08fbcb6305b52
Merge "Update formatting"