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
am: 297bb1a1b7

Change-Id: Ie4842fbbbea86478f2a6586305c2161a086ab62a