Merge \"Make stream tracing have a higher thread count on host\"
am: ce1ba111bf

Change-Id: Ib482cc8e3eb49aac849a809fb4d47368abfffa77