Use tabs to comply with coding conventions

Change-Id: If61a4230cfb398f69ad2f6165006d1f751570e7e
Merge "Use tabs to comply with coding conventions"