am 34ce73a9: Merge "Revert "Fix instrumentation frame check with inlining""

* commit '34ce73a962379b7b844c605f1c4c80cf133009e3':
  Revert "Fix instrumentation frame check with inlining"