Merge "Fix divide by zero" into nyc-dev am: 8996f41189
am: c240a2898d

Change-Id: Ib0b1639f471f25002b7ee3ad9837b09cdd9063b3