Remove trailing whitespace in messages

Change-Id: I937f02c994efd481bc92d528c87a4901eacf7187