Merge "Fix @GuardedBy annotations in InstallPackageHelper"