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

Change-Id: I2c90de223df7b7fc700b52569e26a5225c69b60b