Cleanup some indentation

Change-Id: I6fa6a36f52a324ba052cb25e780323af1658591e
Merge topic 'super_minor_indentation_fix' into master

3b363d27 Cleanup some indentation