Merge change 1155 into donut

* changes:
  Don't allow negative numbers in ToneGenerator toneType parameter Bug 1836596