am 3ef7f0af: Merge "metricsd: Add test case for the upload service."

* commit '3ef7f0afb86be9473728f4fb3679be0c6f21ff82':
  metricsd: Add test case for the upload service.