Merge "Only count user 0 for diskstats package logging."