Merge "Installd: Change app image name computation" into nyc-mr1-dev