Fix indentation issues

Change-Id: I707bba073a9f240ebbba0a09c4ce293e8aa6dd58