am 2fe03177: am 7ad4171f: am dd11d286: Merge "metricsd: Persist the report to disk if an upload fails."

* commit '2fe03177cf6e93ff587de62415a972d5ac8e03a2':
  metricsd: Persist the report to disk if an upload fails.