Merge "remove only use of OVERFLOW_COUNTERSET"