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

Change-Id: I7e4de9437a7ba41e239a1906e58465cf312a6539