Merge "Use user-specific PackageManager." into jb-mr1-dev