Merge "Fix a dead lock between garbage colletion and sample-based tracing."