Depends-On: https://review.opendev.org/#/c/740601/
Change-Id: I85f54c041eceb67611c476472391ff1e44dfc8eb