Merge "Pass in message_version_ received from the secure side." am: 1a955faab2 am: 4e8bbb968c am: 3a5d47af18 am: eb7207dbcd
am: 4a6626980c

Change-Id: I45212e215fdb3286a95d0ba06f7a46b2db0e11ca