Merge "Stop statsd Anomaly Detection crash"