Merge "Handle race conditions in SCS when statsd dies" into rvc-dev