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

Change-Id: I2720c4439848f9aab8d7fa4f93b548793d129a4f