Merge "Adding size suffix to diskstats fields." into pi-dev