Merge "metricsd: Split out the trait name from the command name"