Merge "Assign cpu times to correct battery state bucket."