Merge "Use new VolumeInfo helper methods."