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

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