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

Change-Id: I3c550edd11e9c03937b7b9323de9e567574f6bac