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 am: 1e53256736
am: fd6d0a135a

Change-Id: Id520e8bcb9d20f81faee79cf928e14a174666a5f