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

* commit '1f410f44a17a01890244270b034cb00f74fedce7':
  Move overflow checks into SkipCutBuffer