Fix allocation tracking race
am: ab4058c14a

* commit 'ab4058c14ad800d20138a6c41b999029d342de2c':
  Fix allocation tracking race