Merge "Adding null check on VolumeInfo" into nyc-dev