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

* commit '9773d94571ed7c13a04ddb818a45820781d3bfdc':
  Toolbox: Disable unused-const-variable warning