Merge "Refactor some profiling info functions"
am: a5dcdf3461

Change-Id: Ieec8fe18817450295a88837405f02c86d01e85f7