Merge \\"Fix WaveGenerator memory leak\\" into nyc-mr1-dev am: 28743b7999
am: 404b6e6ee5

Change-Id: I3b97b23e68b23de74f1ff0130f9c9d721bf47382