e242121880
For https://review.opendev.org/897549
(cherry picked from commit 912f33e071)
For https://review.opendev.org/897549
(cherry picked from commit 912f33e071)