Use spaces instead of tabs for indentation

Change-Id: Ib61ecc63f2a7d8ab7feb7f6bb15a35c44108e0c4
Merge "Use spaces instead of tabs for indentation"