Merge "Fix allocation tracking race" am: 78fb377733
am: d30d5cdf57

* commit 'd30d5cdf57af88d88ab395de432fdacdc7b749de':
  Fix allocation tracking race