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

Change-Id: I2029bc94536f3617da34bfc4ac18489819baa14a