Fixup a few more indenting differences

Change-Id: If74b4eeb1484c71c7c0917a0e49b15d20cfd346d