Merge "Fix race in AllocEntrypointsInstrumented"
am: 6f1b7ec

* commit '6f1b7ecf61a7be88bcbb259726e99a78a7235d15':
  Fix race in AllocEntrypointsInstrumented