Merge "Break wait_for_volume_resource_status when error_extending"