Fix allocation tracking race
am: 68d4c069f2

* commit '68d4c069f2920897cad2870a2257ed7af3c1db96':
  Fix allocation tracking race