am 5cd7604c: am 2815f124: Merge "Fix proxy tracing and enable tests that now work with tracing."

* commit '5cd7604cb578d715ee3898295fa65b131a1ecd25':
  Fix proxy tracing and enable tests that now work with tracing.