am f5397f6b: Merge "Fix several ineffective integer overflow checks"

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