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: If764a993b942b0d675a619c12ce89323e34cbc88