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

* commit 'c480b8e6dd8a18566b391a9893436311452027c1':
  metricsd: Split out the trait name from the command name