Android N IOT Preview 2 (NIG40)
Merge "Fix WaveGenerator memory leak"