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

Change-Id: I50e3f6b76901a729614925f6b1b4d9bf2ef21e2e