Merge "Add more debug info for profiling." into honeycomb