am a1563026: am 5642a2e0: Merge "Revert "Move overflow checks into SkipCutBuffer""

* commit 'a1563026c59471183bbc3bc5f6183e663fa5099d':
  Revert "Move overflow checks into SkipCutBuffer"