Merge "Refactor some profiling info functions" am: a5dcdf3461 am: b05797837f am: 6a81a2f79d
am: bc10d1cbfc

Change-Id: I471da0ce95577e5b70e8c6812f92eb33c1d686f2