More reformatting for uniformity

Change-Id: I3e7b2e9bb0fdb21179d07d281e19646c88041bbd
7 files changed