Merge \\\\"Fix WaveGenerator memory leak\\\\" am: f58e41ab2f am: faf2adda1b am: 9950354362
am: 38c26fba02

Change-Id: I5c3af1c98cfa7f64632b3be6ec8c1224da5f6d65