Merge "Fix race condition in PackageManager." into mnc-dev