Merge "Prepare PackageManagerService for snapshots"