Merge "Rename CancellationSignal using preferred spelling."