Shorten overly long lines

Change-Id: I0dde5d6251420bf43636a1e8e0f19f44592aa7e7
Merge "Shorten overly long lines"