am 49264407: am 7139b0c7: Merge "toolbox-ls: re-introduce clobbered error message"

* commit '49264407de7b033fb30cdf3fac8919d75b5ea206':
  toolbox-ls: re-introduce clobbered error message