am 7edef744: Merge "Revert "Revert "Fix instrumentation frame check with inlining"""

* commit '7edef7441d28db1403fbc5641b56a26ecf355879':
  Revert "Revert "Fix instrumentation frame check with inlining""