Fixed spacing and alignment

This fixes lint 'two-space soft tabs not used'.

Change-Id: I78aae2a826ba663711964faaea9040247cd0022e
Merge "Fixed spacing and alignment" into production