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

Change-Id: I782db9306690bbba1fbd3e5318d673973d4e0d43