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

Change-Id: I299c0895349b4aa9439814d5040dceb3e2485ee8