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

Change-Id: If308d605988edc8ef48399255448b5ff226dee53