Merge "[versionitis] pull image id from recovery into props" into mnc-dev