Merge "ART: Fix streaming tracing issues"