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

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