Merge "Fix edge case in statsd alarms" into rvc-dev