Merge "Move forward the alarm timestamp when config is added to statsd." into pi-dev