Move colons to messages for consistency

Change-Id: I4f82a7597f67dc56039badb38aa5977e456d8c1c
Merge "Move colons to messages for consistency"