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

* commit '05bfe7fb95540bae6a42a745fe3bcc1d39a67a7c':
  toolbox-ls: re-introduce clobbered error message