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
am: 8f8e719106  -s ours

Change-Id: I18196452f6a19fe21fc4cad76c8df2165a044353