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

Change-Id: Ie82d1dfa473886b9b166804da985bce439c90900