Merge "Add precondition to disable verification of apps" into nyc-dev