Upstream lib-4774 update.
More reasonable PID constants.