am ea8d0258: am 821a554c: Merge "[versionitis] pull image id from recovery into props" into mnc-dev

* commit 'ea8d0258ea0057070f49c13bf8d83cfad14584eb':
  [versionitis] pull image id from recovery into props