Trim some long lines

Change-Id: I56dd8632539a96bbc8728939eef69f2d0999eaf6