Backport compatible message changes from master.

Change-Id: Id6d2b95886daddbc049e67f8636f7e09d433eb2f