Merge "Fix a dead lock between garbage colletion and sample-based tracing." am: 50caa3d20e
am: 2661363b20

Change-Id: Ia505a4b04705fdbccb3f4dc6299dcdb96c8f8bc1