Merge "Statsd_test update for rounding up alarms"