Merge "CpuStats - Change the field used for the debug entries"