Merge "Support multiple trace files."