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

Change-Id: I4eaa574834b9f1dd40ba9f62bd1f7966ac720dbd