Backport compatible message changes from master.

Change-Id: I4c67e4f3e37ef99d594f3d191ff1af81428b9d53