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

Change-Id: I8f83a4c8415a568eaea68a06154a41686b12df6d