Merge \\"Installd: Change app image name computation\\" into nyc-mr1-dev am: 2fc9381a2a
am: bc4e455429

Change-Id: I7fdee1aa622e067af0e5e81c2f9061a0424ee285