Merge "Move the call to updateCpuStatsNow() out of the AMS lock"