Merge "Fix a CC 145-alloc-tracking-stress deadlock."