Backport compatible message changes from master.

Change-Id: I543547018114cb9b30dfacd78828568be58fd8b6