Merge "Fix allocation tracking race"
am: 78fb377733

* commit '78fb377733796e4a203bc3530ef7dfc6df104245':
  Fix allocation tracking race