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