am 83e33c05: am 58e17cea: Merge "Stop thread from reattaching during runtime shutdown while tracing."

* commit '83e33c05267e64085c7454bbfbe29dc00b70536d':
  Stop thread from reattaching during runtime shutdown while tracing.