Merge "Splits AnomalyTracker into two files"