Merge \"Fix stream-tracing with default methods\"
am: 38be534337

Change-Id: Ibad99838d15d0b87ea5ba1fe897f27d4ba83f447