c86684c91a
Aligned with changes in promenade repo: https://review.opendev.org/#/c/657879/ Change-Id: Ia1d5ddabc47390f12557032b1716734cfcbcd540