Merge "Workaround for verifying large APKs." into nyc-dev