Merge "Fix create_volume_snapshot under scenario"