Merge "Fix another problem with procstats bucketing."