Merge "Work on issue #24403813: ANR traces are too heavyweight." into nyc-dev