Fix line lengths for commit message

Make the line lengths to match what Gerrit expects (max. 70 chars).
Also correct wording of error message.

Change-Id: I852426181622d94b86039093346a83bf481145ee