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

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