b551e587b3
for consistency within the codebase. in some cases simply join the lines. Change-Id: I071f061052e274c8a69f651ed4305befb4414a40