Merge "Handle race conditions in SCS when statsd dies" into rvc-dev am: 76994e73a7

Change-Id: I343077012437727108593ed14982cb3ba2f6f3c4