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

Change-Id: Ic4c7c38472f55959c30f6373e46ceca6ff645e84