Merge "Use specific users for metricsd/metrics_collector." am: 23c2ffb0aa
am: 8d220f3294

* commit '8d220f329408cfffd4496ff98a7c8e3af5c52a64':
  Use specific users for metricsd/metrics_collector.