Merge "Remove dead code from CarDiagnosticService"