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

Change-Id: I7f2e2d2483de7c51d0f6768eeaab9b9a1063c862