Merge "Revert "Do not load app image for class collisions""
am: 54c42cea2b

Change-Id: Id7423a50ba919d96db44b26564515e524198b80d