Update formatting

Break or shrink long lines.

Change-Id: I729dffe3f0d9e1132d9232779dc60647a1dc5a97