Merge "Merge wait_for_volume_status to common method"