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

Change-Id: I8a200659b3cd91e2a7a13f5393fb95a2f508087d