More profiling points.

Change-Id: I2ecdcb4313c74f29224ef210007b3905cfe3f5c5
Merge "More profiling points."