Merge "Profiler code cleanup"