Merge "Merge "Fix for tone glitch produced in ToneGenerator" am: 46f1c24c5a am: 84183ba496 am: 09b0b40fb4 am: 67b5bb745b" into nyc-mr1-dev am: 06d41d0dcf
am: 75d29c5d9d

Change-Id: I45de1e6be156811b2fab11fed02d33a149b81fcb