Minor coding style whitespace cleanup

Change-Id: Ic066eda3a1a2db51b2a953a81829ce7f92568125
Merge "Minor coding style whitespace cleanup"