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

Change-Id: I403238ef299fae85216a190035fd4335451560af