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

Change-Id: Id3f12e44b2958664a3bc4e2918d73e77ece3eb2f