am 62e45483: Merge "Avoid instrumentation stack corruption."

* commit '62e45483db4aa1be096d3ce91903e01ef52fb901':
  Avoid instrumentation stack corruption.