Merge "Fix addition/overflow checks." into qt-qpr1-dev am: af8f6cf3ab

Change-Id: I4f604cb104cc49b7e8f6612f1033a113faf51a48