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

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