Fix various cosmetics

Change-Id: I7dd7617c415710219fc04eb8d2492dc11b938fac
1 file changed