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

Change-Id: I51df4c9d3e7a106855ba675f70156031561df787