Few adjustments to the output to make it consistent with gofmt. Change-Id: Icb673a0632c3be4cb0f4ab1c4aeffc0290e38e95