Merge "Fix upgrading in update package pipeline"