am 510f7aca: am afd238af: Merge "Move overflow checks into SkipCutBuffer"

* commit '510f7aca71dfa914869bd9709fc96e69d312e44f':
  Move overflow checks into SkipCutBuffer