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

Change-Id: I1b3fca2266f7f0d09d0119f8a48fad4dc526f5f9