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

Change-Id: If80468882bfdeb52b32a6451c102a3b717f4c234