Depends-On: https://review.opendev.org/#/c/751233
Change-Id: I0171e5a73d8d36257656d836a9231249d0b88b84