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

Change-Id: I0ed92a012791cbc694eb99350149b40cc7d32564