Merge "Fix for tone glitch produced in ToneGenerator" am: 46f1c24c5a am: 84183ba496 am: 09b0b40fb4 am: 67b5bb745b am: b29385110c
am: 0d33ca9673

Change-Id: I21de71fcae297b9038711cc3f9b5cf1550de1b7a