Merge "Do not load app image for class collisions"