Merge "Handle StorageManager#getStorageVolume exception" into mainline-prod