am 66255db0: Merge "metricsd: Only collect metrics over a short period."

* commit '66255db05d590bcd011fd3f8b687161f737b3aa8':
  metricsd: Only collect metrics over a short period.