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

Change-Id: Id78ea62f45ae45e47099b1f0f494ac5c1f492bdf