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

Change-Id: I23acd0331d861527b80b3d25e67e278d486b3833