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

Change-Id: Iae5baa5892962245143dfecf4bac156dfe5a7912