am 7f55e82c: Merge "Toolbox: Disable unused-XXX warnings"

* commit '7f55e82cd2673c89d7fc52e076b81f2379a75283':
  Toolbox: Disable unused-XXX warnings