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

Change-Id: I1df57cb96be8296a423e0f9c3de148ff23fdd469