Merge "Take 2: Integrate StateTracker into statsd"