Merge "metricsd: Persist the metrics to disk periodically." am: 818f757383
am: 72fc3b6cb9

* commit '72fc3b6cb9b64d384749c856cb50935f56c4363d':
  metricsd: Persist the metrics to disk periodically.