Merge "Move procstats_pkg_proc into its own wrapper"