am 2fe63c65: (-s ours) am 5bd9771c: (-s ours) am 2c99211d: Merge "Enable unsigned-integer-overflow"

* commit '2fe63c659efac1b9e8c4dea2f5effc8ed718382b':