Merge "Fix getStorageVolumes to return only storage volumes available to the calling user"