Merge "Check argument in PowerProfile.getNumCoresInCpuCluster" am: 74952231df am: 310c1b76ea

Change-Id: I1094043068575b6b2a77852d12ac341265aaf6df