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

Change-Id: I62a0a06ea2722f4b149df04c65bae2a0dd9fd71f