Merge "Rephrase code to avoid overflow" into qt-qpr1-dev am: 35b08ba4e0 am: 064e3517fb am: 19ead5a050

Change-Id: If8b5558ea4f434dca4a3cefd30462bd0ff68730d