Backport compatible message changes from master.

Change-Id: I026761b539afed96da99422d7bed759471465919