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

Change-Id: Iaf40149cd6681fa06e83b4c262cd20028990f9a2