Fix spacing and break some lines

Change-Id: Ia57685d8858e02e399ad5c75ce64d12609d340ac
Merge "Fix spacing and break some lines"