am eb0b1513: Merge "Toolbox: Disable unused-const-variable warning"

* commit 'eb0b151369371993a70c2079b8253f6dd24814b7':
  Toolbox: Disable unused-const-variable warning