Merge \"Put the deletion of profiling info under a GC critical section.\"
am: 1a7c33704a

Change-Id: I4952fd9f60b7b5c85b2acba7d808f008601029d0