Merge "Revert "Fix proxy tracing and enable tests that now work with tracing.""