am e47eb98a: am 674c0445: Merge "toolbox: silence some compiler warnings"

* commit 'e47eb98a337081d0d6c740eb7d8b990faf4090d7':
  toolbox: silence some compiler warnings