Merge "Fix for tone glitch produced in ToneGenerator"
am: 46f1c24c5a

Change-Id: If7da9dbfe106fdda640fc817a4fffe05b2ed5dff