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