Merge "CallDiagnosticService API"