Merge "Fix addition/overflow checks." into qt-qpr1-dev am: af8f6cf3ab am: b034fc50aa am: 95fabcd47c am: 3a387dfb33 am: efe4dcf59d

Change-Id: I86fbae3777f4474b0f4d7a09d3305eeb1c37d2f0