Merge "Fix toolbox failure return to match similar tools."
am: 5aef89b

* commit '5aef89b3a340f5634a0de32590c9ea9722cb6e99':
  Fix toolbox failure return to match similar tools.

Change-Id: I8f6143f9e63ce927c9614972502323a3907734b5