Merge "Do not load app image for class collisions"
am: 96e81f2ddf

Change-Id: I7cf80efddc14ce8fbf9026e8874a2881cf112881