Break long lines

Fixes CodeSniffer errors/warnings.

Change-Id: I6417072270ec7236ad2412abda6f6afce189f0fd
Merge "Break long lines"