Merge "Revert "Revert "Do not load app image for class collisions""" am: 6623bc389c
am: c4b59ade3e

Change-Id: I5f530748a076a6d935a1aec9b073ecde0e9991c4