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

Change-Id: Ib80f47bbd0ed9f1a2e4307c600836b64e7f8d522