Merge "Fix integer overflow and divide-by-zero" into klp-dev am: b264ece2c0 am: bbca2719c6 am: c2e69851ea
am: 3285770d37

Change-Id: Id82c89fed96d3cfa11d68ba5d791d5a360aa243c