relies on https://review.opendev.org/#/c/734699/10 Change-Id: I86ce5c2e7fc8615f5f4827b385b567842572590c