DO NOT MERGE Fix divide by zero am: 2e211d38a3 am: 52e86acf03 am: 1607de251e am: c3c3ae039a  -s ours am: f4211ba53a
am: a38f9d17c6

Change-Id: I216f24273722e13cbb485005b8cf604b182f73f1