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