More reformatting for uniformity

Change-Id: I37cd6e62d6e4e4b35b6f4cf2c416b5916f42e56b
3 files changed