Merge "DO NOT MERGE Fix divide by zero" into klp-dev am: 2c28e5b126 am: a5477b11be am: 913b7564c4  -s ours am: 391b2806b5  -s ours
am: 172fa07944

Change-Id: Ice1b8c59d1546f09c33fe1e077b30a8bab3fd137