Break some long lines

Change-Id: I6b984e03611f937320464e32567495e5b61e315f
Merge "Break some long lines"