am 89792b9c: Merge "Fix instrumentation frame check with inlining"

* commit '89792b9c5ed09dda2937944b69b1b2016807b6aa':
  Fix instrumentation frame check with inlining