Clean up some long lines

Change-Id: I563dc712da704fc05bd8575d4caafec06930f366
3 files changed