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

Change-Id: Iba2ceca6342321cf02bec19ee9c4b79a590d23b5