Merge "use services decorator to enable telemetry test"