Fix profiling method calls

Also add a comment to some code that took me a few minutes to recognize.

Bug: 58987
Change-Id: Ie2318bad6a70594a6490cdba1a3798ed9868126e
Merge "Fix profiling method calls"