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