Merge "Fix alloc tracker locking issue"