Merge \"Fix profiling output to properly display class info.\"
am: 9755c262df

Change-Id: I417529769b10bd7693461c90f0306881158332a6