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

Change-Id: I8637f6a178a49930e5fba96a72a32b803f306595