Backport compatible message changes from master.

Change-Id: I4a5b82c78009a1fcae3fdeddf38b618341eb0e33