am 0be33f2d: Merge "Add shortcut to avoid potential divide by zero in some case"

* commit '0be33f2d522f76f48062a59ddb520815a0851875':
  Add shortcut to avoid potential divide by zero in some case