Merge "Fix integer overflow and divide-by-zero" into klp-dev am: b264ece2...

Merge "Fix integer overflow and divide-by-zero" into klp-dev am: b264ece2 am: bbca2719 am: c2e69851 am: 3285770d am: d935c7f1 am: 98ee832c am: 1db2ee3d am: 946a690f am: 5fef11c6 am: 3a3cc883 am: d218b519 am: 9305cf71 am: 7422dafe am: 731527f4 am: 4e083b91
am: a5091c84

Change-Id: I36e38ee2a6b74422bbb28c5368f5518bc69f71df