Backport compatible message changes from master.

Change-Id: I026d179d5a579043880bb37e134e9b139790bd52