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