Merge "Fix the wrong process state for statsd logging." into main