Merge change 20739

* changes:
  Fix issue 2045983 ToneGenerator: fix void statement.