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

Change-Id: I1e0dec6ea6030301ae88918f862d29314d063cc9