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

* commit '4074ba2c112b1f7ab9a04d5a2b96c7cd5fd70a17':
  Added factory to create ToneGenerators