am c454fe0c: (-s ours) am f5397f6b: Merge "Fix several ineffective integer overflow checks"

* commit 'c454fe0c26b57c74ad19cb0f332f5871dfcff09e':
  Fix several ineffective integer overflow checks