Merge "Remove StateConditionTracker from statsd" into rvc-dev