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

Change-Id: I10af6a46cfe4371c3829196c4dc840e5d2a01298