Merge "Make message format change backwards compatible." am: 513bf3c355 am: 89d0e6c39b am: edc5538cc9
am: 86dbf417fc

Change-Id: I768bf4ffca83bfd53f5b9899910a88aa008d4bb7