Merge "Merge "Fix potential divide by zero." am: 8d3f61724d am: 4642158940 am: 14a8c9175b" into oc-dr1-dev-plus-aosp