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

* commit '089e1fb112e2fd3909a65cfd460516409ff29187':
  metricsd: Use different directories for each daemon.