Fix double-space in messages

Change-Id: I5dbc0512b6447dfeb7c287e212245e86d105928b