Merge "Merge "Fix potential divide by zero." am: 8d3f6172 am: 46421589 am: 14a8c917" into oc-dr1-dev-plus-aosp