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

Change-Id: I2555fb5203f776a7a73efb30a93e600993dcf189