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

Change-Id: I5634176e2d407624a00f288dcbf067390285d39f