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

Change-Id: I4e579b971845197d6ed9c276287aff3ff694e256