Merge "Fix corruption in InCallTonePlayer" into nyc-mr1-dev