Backport compatible message changes from master.

Change-Id: I7e0b22377ba300e655536461b750941b6ce4b00d