Break some long lines

Change-Id: I8c3919c04a3fc468191750af51b8be3f952f464e