Merge "Fix potential divide by zero."
am: 8d3f61724d

Change-Id: I88b10756befb5a510405b7f6eea27785c965ca8c