Merge "Fix package verification with multi-user" into jb-mr1-dev