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