Backport compatible message changes from master.

Change-Id: Ic78ae1370c357fe7ac62146143e2ad7f71d1b3fa