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

Change-Id: Ia520752e839996cd7ce8fe8b31a515b0a6419a96