Goal: 

< Goal based statement, with context - remove these notes before saving -->

• Backport https://review.opendev.org/c/openstack/cinder/+/950927/ to applicable releases

Acceptance Criteria:

<-- Notes for defining Acceptance Criteria  - remove these notes before saving -->

A list of verification conditions, successful functional tests, or expected outcomes in order to declare this story/task successfully completed.

• Verify X
• Verify Y
• Verify ...