am 549c9b17: am 4bf8d11d: Fix proxy tracing and enable tests that now work with tracing.

* commit '549c9b1776c03789699f0fa6b7b0c90d7fcca019':
  Fix proxy tracing and enable tests that now work with tracing.