Merge "Fix benign overflow in ToneGenerator.cpp"