Merge "Add traces to latency sensitive points"