Merge "Fix allocation tracking race" am: 072cbe0ca5
am: 9c1eb44cf0

* commit '9c1eb44cf00bde3421a95b4c4249309e1a44674a':
  Fix allocation tracking race