Merge "Fix integer overflow and divide-by-zero" into klp-dev am: b264ece2c0 am: bbca2719c6 am: c2e69851ea am: 3285770d37 am: d935c7f16e am: 98ee832c7e am: 1db2ee3dbd am: 946a690f5c am: 5fef11c61a
am: 3a3cc883c1

Change-Id: Iefe473341e64546c69ee98a8a4e47b17903ca02d