am 4534ec1a: am 4a5fbf74: am 3cc11bfc: Fix several ineffective integer overflow checks

* commit '4534ec1a552c125ef7eea0990a84fcefb58335b9':
  Fix several ineffective integer overflow checks