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

Change-Id: I8d2974c4db3875cbfe790950bccdc1d2eeef21be