Merge "Make message format change backwards compatible."