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

Change-Id: Ia8ac3c0f40930cd012107ef7a7c02dd2bb4c41f2