Merge "Fix profiling output to properly display class info."