More message cleanup (minor fix)

Change-Id: I79b8dbbf213314b2fdfb8ea0390fa1ad9b8eca37
Merge "More message cleanup (minor fix)"