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

Change-Id: Id1bf2fa710c24ba76efbc5ad9b83dab63b8c334a