Merge "Avoid instrumentation stack corruption."