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

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