am 3cce4937: Merge "Fix benign overflow in SampleIterator"

* commit '3cce4937ae9bb3a522bee74a47807c8cf0b462d5':
  Fix benign overflow in SampleIterator