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