Merge "Fix side effects of trace-ipc and dumpheap commands" into sc-dev