Merge "Merge "Handle race conditions in SCS when statsd dies" into rvc-dev am: 76994e73 am: 6a2d80e1" into rvc-d1-dev-plus-aosp