am 5e924468: Merge change 5662 into donut

Merge commit '5e924468cd80bfadd686515a5b4193594a2811eb'

* commit '5e924468cd80bfadd686515a5b4193594a2811eb':
  toolbox: Revise route utility.