Merge "Fix potential crash when per-procstate cpu times tracking is turned on."