Merge "Revert the field number change to make statsd_config proto backward-compatible."