Merge "Don't hold lock calling into PackageMgr" into nyc-mr1-dev