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

Change-Id: I339ae455b16cf1069b04dffe414f2ab0c8dcdfca