Merge "Fix benign overflow in SampleIterator"