Merge "Fix a CC 145-alloc-tracking-stress deadlock."
am: 3890e85

* commit '3890e85aaab150bc0a5e116be762c786c882e1ec':
  Fix a CC 145-alloc-tracking-stress deadlock.