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

Change-Id: Icf722dc68b66ff4a7f9748555382b870950802e0