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

Change-Id: I18fc0116acb1a24dc1061333396333a8e3f6b70f