Merge "Delete alloc tracking map outside of critical section"