Merge "Add check preventing div0 issue" am: 1777155106
am: f52dc31562

Change-Id: I2680737acc0f3166f90a1f5d1f190d9f726b3d29