Merge "storage: Don't list removed volumes in storage list" into cm-11.0
(cherry picked from commit 37820a16ab2ca66735893cf16482c7f71edca131)