Merge "Changes to support side-loading of apps from other users." into jb-mr1-dev