Reviewed-by: mgerdin

Summary: Avoid overcounting when CMS has concurrent mode failure.
Reviewed-by: ysr
Contributed-by: rednaxelafx@gmail.com