Merge "Change very large apps to verify instead of extract" am: 5e219b98f9 am: 22dc0aa939 am: 984d018a66
am: 7b9ae6b4df

Change-Id: I806b1bad7bac1edf2cfddf76d1ae87b746879b63