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

Change-Id: I83bb32beff76f9f1711c49d13798156ae0ef8ed9