Merge "Rename dumpstate service to include '.example'."