Fix handling for invalid or missing app images
am: 6b689ceb63

Change-Id: I8cc81a37eac98eb265b9011d7b80c9730dd30c14