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

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