Merge "Fix edge case in statsd alarms"