Merge changes I91686ac4,I745a8e88

* changes:
  Fix instrumentation stack tracking
  Revert "Correctly handle instrumenting threads multiple times."