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