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 am: 9934c7d715 am: ccf2518644 am: cf199260de am: d8d4f9ad23
am: 52e747e6a6  -s ours

Change-Id: Ief8815a688ee2af9c9cc0a5db168483f2630ac60