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

Change-Id: I877e344964c48aecafe3154123da36ff2d8a592a