Fix whitespace

Change-Id: Idaaa77a0bf889bb982f410ddc33ec6c07c46408f
Merge "Fix whitespace"