Merge "Revert "Pass URLs to package verifiers"" into jb-mr1-dev