Merge "Fix divide by zero" into lmp-dev am: ef6934cdf9 am: cd1950301d
am: 79a5c7031e

Change-Id: I469e756acfb69299e2ade43d3123cdb3e9872a0d