Merge "Revert "Add telemetry gabbits tests to smoke"" into mcp/ussuri