Clean up collecting app image string references. am: e1070377d8
am: 5d36bbebee

Change-Id: Ic580f4aebb0857d2a50b3575588ac938f9767291