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

Change-Id: I0b2765bba69b2de8ec6a5d6cdc894c03e587ce2a