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

Change-Id: Ib0adafe44b800b31e549925d253dd728da2880d1