fix some spacing

Change-Id: Id7eda67a43f9040117edd79fdbeb678f1c3a6da2
Merge "fix some spacing"