Merge "Fix package verifier lookup" into jb-mr1-dev