Merge "Delete alloc tracking map outside of critical section" am: e4cec517fa
am: 546719a89f

* commit '546719a89f898377b3c6515d38a13b6fa9a804dd':
  Delete alloc tracking map outside of critical section