Merge "Traces with real-to-elapsed time offset"