Merge "Add tracepoints to dumpstate sections"