Merge "Add some telemetry tests in smoke." into mcp/queens