Merge "Handle race conditions in SCS when statsd dies" into rvc-dev am: 76994e73 am: 235b5837 am: 18ec8df6 am: 27cf1392 Change-Id: I155d4511ae692019480b1192b9158b674c7eae09