Merge "Make message format change backwards compatible." am: 513bf3c3 am: 89d0e6c3 am: edc5538c am: 86dbf417 Change-Id: I768bf4ffca83bfd53f5b9899910a88aa008d4bb7