Merge "Clear the past buckets for no-report metrics" into pi-dev