Merge "Using a single proto file for tracing"