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

Change-Id: I27a5014657a36dd1626578e17ebc36f6362ca4bd