Merge "Bug 2410: Use generated serialVersionUID for messages"