Fix tracing shutdown
am: ecd21be250

Change-Id: Iea2a20b8d37bb5cace8f34fb96128de49b0a2f68