Fix mixed indenting - tabs to spaces

Change-Id: Ic01febb9dd1135a6ec4e7b83bcbc1a9d69aa9dc0
Merge "Fix mixed indenting - tabs to spaces"