Fix bug in the original profiling support.

Change-Id: Ife375db5046b6addd20a97c048dc4a05c80ff81a
Merge "Fix bug in the original profiling support."