fix some spacing

Change-Id: Ie7bb35871cc99237f3a655f7db22ca1f0646df5e
Merge "fix some spacing"