Merge "Disable app image for very large apps"
am: ad008d58ed

Change-Id: I3203649707aae68091195b73d8309892e8058af9