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

Change-Id: I643dd91863853f4aafdec3285227fa12ecbd23f8