Merge "Handle stub volumes in StorageSessionController"