am cf66c48a: am 8df73882: Merge "Revert "Fix proxy tracing and enable tests that now work with tracing.""

* commit 'cf66c48a6fde13c914a663f93fa43a7648ce20a3':
  Revert "Fix proxy tracing and enable tests that now work with tracing."