Remove hard tabs and trailing whitespace

Change-Id: I27f0054f8aca053e0fd31c4b848771438b0f34ac
Merge "Remove hard tabs and trailing whitespace"