Merge "dumpstate: move dump_traces to Dumpstate"