Merge "Suppress OperationCanceledException logging." into klp-dev