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

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

Change-Id: I64a482b542bd775402b63c705eb8f5a9867455bb