Use the right streams in right places

Change-Id: I204d422d3645d4527044bb3d1750ad6ab625fc02