Backport compatible message changes from master.

Change-Id: I6eb886b2ead3d2cc2a96c18f43c98da0c65ce999