Merge "Flush the past buckets in anomaly tracker when time jumps forward" into pi-dev