Cherrypick commit 93269160 into 15-9-stable-ee branch
Context on slack thread: https://gitlab.slack.com/archives/C3JJET4Q6/p1677180240169719
The downstream QA e2e:package-and-test pipeline from the MR for 15.9.1 release is failing.
!112302 (merged) fixes those errors so this is to cherry pick the fix to 15-9 stable branch.
Edited by Jenny Kim