Merge "Supports legacy stream type in getUsagesForVolumeGroupId"