Remove duplicate entries in messages.inc

Change-Id: I8ecbc90b945e718d26b768786181ad2a167de5ba
Merge "Remove duplicate entries in messages.inc"