Merge "Adds dumpstate log file to bugreport zip."