Merge change 5100 into donut

* changes:
  Fill in CDMA gaps and clean up ToneGenerator code