Fix whitespace

Fix issues found by checknicess check

Change-Id: I8b47bfea1c4e35930beab96f5db2e29a98d7c0c6
Merge "Fix whitespace"