Merge "QCN3018: Fix num present cpus"