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