updates to streams

Change-Id: I092485e8505bd0753ecea11c60fa55ac04bca33f