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

* commit '3fd57f26c199c1bc999ac18374be5c633e87ec76':
  metricsd: Only collect metrics over a short period.