Revert "Revert PDX tracing."
am: 4a05cbf36f

Change-Id: I71552996f7af2ca5204998b05557cb32d4a09d52