Merge "Release mPackages lock earlier" into nyc-mr1-dev