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

Change-Id: I0d462bab958d2b3378debbff397ba11933fc681c