Backport compatible message changes from master.

Change-Id: Ic9c1a35fecf3c09d2cc60057783ebadaf656d6ba