Merge \\"Fix WaveGenerator memory leak\\" am: f58e41ab2f
am: faf2adda1b

Change-Id: I7f2fbc21275ad795a464146add84321b9161447f