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

* commit '4e44b2ee286bd993210aa81ad20ebbf1d1a816c6':
  Fix several ineffective integer overflow checks