Merge \"Don\'t hold lock calling into PackageMgr\" into nyc-mr1-dev
am: c8967160aa

Change-Id: I9e4faf9115c35a7d2995ddc5ad82ed12df6f2a9b