DO NOT MERGE Fix divide by zero am: febbd52cd9 am: 55ce7e5d1e
am: 1b3f61ceaf  -s ours

Change-Id: Iaf8f9526bbb01eca75ded491f2dd43baabaee22e