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

Change-Id: I272acb1f5178ccaf43fa12ed096bb4bb03834213