am b85c374: Merge change 1155 into donut

Merge commit 'b85c37432b3836fd30c81191425d7e00dcf2082c'

* commit 'b85c37432b3836fd30c81191425d7e00dcf2082c':
  Don't allow negative numbers in ToneGenerator toneType parameter