Revert "Revert PDX tracing." am: 4a05cbf36f
am: 30de3e1d3e

Change-Id: I97a2d572a7da72364577cfd421c2afcd047e875c