Update documentation and break long lines

Also remove some superfluous newlines.

Change-Id: I904d6ddeb976434708d5a22df9e8abd2e6f60a6c
Merge "Update documentation and break long lines"