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

Change-Id: I265e812de7fca1a0de0d545029064bc6424ee071