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

Change-Id: I2d9d85ba698375e82e53f2e5fe3373ad02546f99