Merge "Allow dumpstate to snapshot traces and attach them to bug reports"