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

Change-Id: I14eea1bdd0530065c81ce98f32af059d682736a6