Merge "Move overflow checks into SkipCutBuffer" am: 8be95ca80a am: 1f410f44a1
am: c396adf7c4

* commit 'c396adf7c434abb687e1dbce63fa084b6b6ec05e':
  Move overflow checks into SkipCutBuffer