Fix whitespace

Remove extra whitespace, replace tabs by spaces

Change-Id: Id03d30c1a645fc93b14c08d6e69d25fd67bff241
Merge "Fix whitespace"