Merge "Fix divide by zero"
am: 659cb35e19

Change-Id: If8c165000be0c80a4471eda58d2b15619bfe3022