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

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