Merge "Remove high-overhead low-signal trace section" into nyc-dev