Merge "Fix allocation tracking race"
am: 072cbe0ca5

* commit '072cbe0ca5ce75bdb448955aa82257cc05dac610':
  Fix allocation tracking race