am 98f15309: Re-enable fast track for ToneGenerator

* commit '98f153091e8f4190b35b9ce15250f308baf4805c':
  Re-enable fast track for ToneGenerator