Merge "metricsd: Use different directories for each daemon." am: 03f9069acc
am: 9d5a431657

* commit '9d5a431657c453d3bdf81c28a214c87250914dd4':
  metricsd: Use different directories for each daemon.