GONRG-5050: finalized changes for preship pipeline

2 jobs for !324 with gcp-preship-pipeline in 2 minutes and 4 seconds (queued for 1 second)
latest merge request