Merge "InstallPackageHelper: fiX the NPE problem." into main