Clean up collecting app image string references.
am: e1070377d8

Change-Id: I79966df7c1c9a92b0108dbe5da51461b8eef3439