Merge "Fix method profiling [issue 4260697]"