updates to streams

Change-Id: Icfbdcfc74767a9add7e32b70000f7d1e6868dc64