Merge "Fix query for CPU count."