Merge "Disable app image for very large apps" am: ad008d58ed am: 622533bacf
am: 245531db4d

Change-Id: I3d948007f661f0c5a485619be3dc34a0a01195a3