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

* commit '05e97e81a5fa2c9cab4cdda15aa2d036243a0c0e':
  Add shortcut to avoid potential divide by zero in some case