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

Change-Id: I4690fad5c3e89abc57cd63e50f30cf0fbbab1294