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

* commit '7139b0c7f8b3c86c866096cb8621a0d866af1614':
  toolbox-ls: re-introduce clobbered error message