Merge "Move overflow checks into SkipCutBuffer"
am: 8be95ca80a

* commit '8be95ca80ab8db3f8355b04f867e0bd42c22feeb':
  Move overflow checks into SkipCutBuffer