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

* commit '5e2c39112471485786aa2f43717ac261a243c153':
  Revert "Revert "Fix instrumentation frame check with inlining""