Merge \\"Fix some \\"possible\\" divide by 0\\" am: 393d3d614d
am: 2f5cdfcfec

Change-Id: I6ba33e58497e006baaecb01486e0bb5b1dbf42a3