Merge "Added factory to create ToneGenerators" into nyc-dev