Merge "Don't call into pkg mgr svc w/ lock held" into nyc-mr1-dev