am f1b53179: Merge "Fix method profiling [issue 4260697]"

* commit 'f1b531793e65fda22818d8dca8b17f94f618ad64':
  Fix method profiling [issue 4260697]