Merge "Added factory to create ToneGenerators" into nyc-dev
am: f4b665e44b

* commit 'f4b665e44b18614dbdcbbffbb59dc165b349eae5':
  Added factory to create ToneGenerators