Merge "Set the clock id in FrameTracer for TracePacket"