Merge "DO NOT MERGE Fix divide by zero" into lmp-mr1-dev am: b6cf6d6a30 am: 4c31eb2675  -s ours
am: db358e20c6

Change-Id: I69d377350a4ec37bf910b4676553dff504524e65