Merge "Improve latency instrumentation."