Merge "Refactor some profiling info functions" am: a5dcdf3461
am: b05797837f

Change-Id: I6b3219fbc9693c7ad380538634ca7383c494d6d3