Merge "Refactor cpu stats pullers" into pi-dev