Merge "DO NOT MERGE Fix divide by zero" into mnc-dev am: ec206acb99 am: 69db172b16
am: a99878f636

Change-Id: I2be8811be839b23ec238ab69fe2f3f410f421a99