Merge "Flush the past buckets in anomaly tracker when time jumps forward" into pi-dev am: cdc9d9008b
am: 3746711c66

Change-Id: Ifef47dde04f685756e660732954876a762a9b11d